summaryrefslogtreecommitdiffstats
path: root/drivers/video
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2016-02-19 09:18:43 +0100
committerSascha Hauer <s.hauer@pengutronix.de>2016-02-23 08:14:16 +0100
commit8ee5479a28df0a3f3019419e46e9ee5c119a27bd (patch)
treeed1fb39fb0a39e89525581a1feeeede937556bb5 /drivers/video
parentf1f8f5556ab94f4f8bedb97ad0199b2e63958c8b (diff)
downloadbarebox-8ee5479a28df0a3f3019419e46e9ee5c119a27bd.tar.gz
barebox-8ee5479a28df0a3f3019419e46e9ee5c119a27bd.tar.xz
driver: Fix return check of dev_request_mem_region
dev_request_mem_region returns an ERR_PTR, fix places which check for a NULL pointer instead. This patch has been generated with this semantic patch, written by me and improved by Andrey Smirnov: // <smpl> @@ expression e; expression e1; @@ e = dev_request_mem_region(...); ... -if (!e) - return e1; +if (IS_ERR(e)) + return PTR_ERR(e); @ rule1 @ expression e; @@ e = dev_request_mem_region(...); @@ expression rule1.e; identifier ret, label; constant errno; @@ if (!e) { ... ( - ret = -errno; + ret = PTR_ERR(e); ... goto label; | - return -errno; + return PTR_ERR(e); ) } @depends on rule1@ expression rule1.e; @@ - if (e == NULL) + if (IS_ERR(e)) { ... } // </smpl> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de> Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com>
Diffstat (limited to 'drivers/video')
-rw-r--r--drivers/video/imx-ipu-v3/imx-hdmi.c4
-rw-r--r--drivers/video/imx-ipu-v3/ipu-common.c4
2 files changed, 4 insertions, 4 deletions
diff --git a/drivers/video/imx-ipu-v3/imx-hdmi.c b/drivers/video/imx-ipu-v3/imx-hdmi.c
index 25fcb0c739..49cbca16e6 100644
--- a/drivers/video/imx-ipu-v3/imx-hdmi.c
+++ b/drivers/video/imx-ipu-v3/imx-hdmi.c
@@ -1294,8 +1294,8 @@ static int dw_hdmi_probe(struct device_d *dev)
hdmi->ddc_node = of_parse_phandle(np, "ddc-i2c-bus", 0);
hdmi->regs = dev_request_mem_region(dev, 0);
- if (!hdmi->regs)
- return -EBUSY;
+ if (IS_ERR(hdmi->regs))
+ return PTR_ERR(hdmi->regs);
hdmi->isfr_clk = clk_get(hdmi->dev, "isfr");
if (IS_ERR(hdmi->isfr_clk)) {
diff --git a/drivers/video/imx-ipu-v3/ipu-common.c b/drivers/video/imx-ipu-v3/ipu-common.c
index 70bb0e59b6..398eefbd5b 100644
--- a/drivers/video/imx-ipu-v3/ipu-common.c
+++ b/drivers/video/imx-ipu-v3/ipu-common.c
@@ -761,8 +761,8 @@ static int ipu_probe(struct device_d *dev)
return ret;
ipu_base = dev_request_mem_region(dev, 0);
- if (!ipu_base)
- return -EBUSY;
+ if (IS_ERR(ipu_base))
+ return PTR_ERR(ipu_base);
ipu = xzalloc(sizeof(*ipu));