summaryrefslogtreecommitdiffstats
path: root/drivers/video
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2014-07-31 09:07:06 +0200
committerSascha Hauer <s.hauer@pengutronix.de>2014-09-16 08:32:10 +0200
commit5bdc82c54a3306f2ae151a00f2df54f9240395b8 (patch)
treeb20a41ad645090b15bda9a89faffc718e0d3a833 /drivers/video
parent29b7f95f3bd244a4b4d036e1b3a94a7bfbe3581c (diff)
downloadbarebox-5bdc82c54a3306f2ae151a00f2df54f9240395b8.tar.gz
barebox-5bdc82c54a3306f2ae151a00f2df54f9240395b8.tar.xz
resource: Let dev_request_mem_region_by_name return an error pointer
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'drivers/video')
-rw-r--r--drivers/video/omap.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/video/omap.c b/drivers/video/omap.c
index 485cc7538b..bd66c92f10 100644
--- a/drivers/video/omap.c
+++ b/drivers/video/omap.c
@@ -29,6 +29,7 @@
#include <malloc.h>
#include <common.h>
#include <clock.h>
+#include <linux/err.h>
#include <mach/omap4-silicon.h>
#include <mach/omap-fb.h>
@@ -442,7 +443,7 @@ static int omapfb_probe(struct device_d *dev)
fbi->dss = dev_request_mem_region_by_name(dev, "omap4_dss");
fbi->dispc = dev_request_mem_region_by_name(dev, "omap4_dispc");
- if (!fbi->dss || !fbi->dispc) {
+ if (IS_ERR(fbi->dss) || IS_ERR(fbi->dispc)) {
dev_err(dev, "Insufficient register description\n");
rc = -EINVAL;
goto out;