diff options
author | Sascha Hauer <s.hauer@pengutronix.de> | 2014-07-31 10:38:08 +0200 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2014-09-16 08:32:10 +0200 |
commit | ed6e965824303255cacc1c1a195d3684caa26bce (patch) | |
tree | 26e2b1b78498675ceae4dd2e990836c26ec1d5ec /drivers/video | |
parent | 5bdc82c54a3306f2ae151a00f2df54f9240395b8 (diff) | |
download | barebox-ed6e965824303255cacc1c1a195d3684caa26bce.tar.gz barebox-ed6e965824303255cacc1c1a195d3684caa26bce.tar.xz |
resource: Let dev_request_mem_region return an error pointer
For all users fix or add the error check.
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'drivers/video')
-rw-r--r-- | drivers/video/atmel_lcdfb_core.c | 2 | ||||
-rw-r--r-- | drivers/video/imx-ipu-fb.c | 2 | ||||
-rw-r--r-- | drivers/video/imx.c | 3 | ||||
-rw-r--r-- | drivers/video/pxa.c | 3 |
4 files changed, 10 insertions, 0 deletions
diff --git a/drivers/video/atmel_lcdfb_core.c b/drivers/video/atmel_lcdfb_core.c index 9748bba366..420ccbedf1 100644 --- a/drivers/video/atmel_lcdfb_core.c +++ b/drivers/video/atmel_lcdfb_core.c @@ -258,6 +258,8 @@ int atmel_lcdc_register(struct device_d *dev, struct atmel_lcdfb_devdata *data) sinfo = xzalloc(sizeof(*sinfo)); sinfo->pdata = pdata; sinfo->mmio = dev_request_mem_region(dev, 0); + if (IS_ERR(sinfo->mmio)) + return PTR_ERR(sinfo->mmio); sinfo->dev_data = data; diff --git a/drivers/video/imx-ipu-fb.c b/drivers/video/imx-ipu-fb.c index abac812cb6..a69df50811 100644 --- a/drivers/video/imx-ipu-fb.c +++ b/drivers/video/imx-ipu-fb.c @@ -1001,6 +1001,8 @@ static int imxfb_probe(struct device_d *dev) return PTR_ERR(fbi->clk); fbi->regs = dev_request_mem_region(dev, 0); + if (IS_ERR(fbi->regs)) + return PTR_ERR(fbi->regs); fbi->dev = dev; fbi->enable = pdata->enable; fbi->disp_data_fmt = pdata->disp_data_fmt; diff --git a/drivers/video/imx.c b/drivers/video/imx.c index b12c09c8cf..b1066e1243 100644 --- a/drivers/video/imx.c +++ b/drivers/video/imx.c @@ -544,6 +544,9 @@ static int imxfb_probe(struct device_d *dev) fbi->mode = pdata->mode; fbi->regs = dev_request_mem_region(dev, 0); + if (IS_ERR(fbi->regs)) + return PTR_ERR(fbi->regs); + fbi->pcr = pdata->mode->pcr; fbi->pwmr = pdata->pwmr; fbi->lscr1 = pdata->lscr1; diff --git a/drivers/video/pxa.c b/drivers/video/pxa.c index b4ce3a1bf8..d6d11ae610 100644 --- a/drivers/video/pxa.c +++ b/drivers/video/pxa.c @@ -29,6 +29,7 @@ #include <fb.h> #include <init.h> #include <malloc.h> +#include <linux/err.h> #include <mach/clock.h> #include <mach/pxa-regs.h> @@ -499,6 +500,8 @@ static int pxafb_probe(struct device_d *dev) fbi->mode = pdata->mode; fbi->regs = dev_request_mem_region(dev, 0); + if (IS_ERR(fbi->regs)) + return PTR_ERR(fbi->regs); fbi->dev = dev; fbi->lcd_power = pdata->lcd_power; |