summaryrefslogtreecommitdiffstats
path: root/drivers/usb
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/usb
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/usb')
-rw-r--r--drivers/usb/gadget/pxa27x_udc.c4
-rw-r--r--drivers/usb/imx/imx-usb-misc.c4
-rw-r--r--drivers/usb/imx/imx-usb-phy.c4
-rw-r--r--drivers/usb/musb/phy-am335x.c4
4 files changed, 8 insertions, 8 deletions
diff --git a/drivers/usb/gadget/pxa27x_udc.c b/drivers/usb/gadget/pxa27x_udc.c
index 3db3480cad..831fbde462 100644
--- a/drivers/usb/gadget/pxa27x_udc.c
+++ b/drivers/usb/gadget/pxa27x_udc.c
@@ -1453,8 +1453,8 @@ static int __init pxa_udc_probe(struct device_d *dev)
int gpio, ret;
udc->regs = dev_request_mem_region(dev, 0);
- if (!udc->regs)
- return -ENXIO;
+ if (IS_ERR(udc->regs))
+ return PTR_ERR(udc->regs);
udc->dev = dev;
udc->mach = dev->platform_data;
diff --git a/drivers/usb/imx/imx-usb-misc.c b/drivers/usb/imx/imx-usb-misc.c
index af1a32110c..576dc9a2f9 100644
--- a/drivers/usb/imx/imx-usb-misc.c
+++ b/drivers/usb/imx/imx-usb-misc.c
@@ -553,8 +553,8 @@ static int imx_usbmisc_probe(struct device_d *dev)
return ret;
usbmisc_base = dev_request_mem_region(dev, 0);
- if (!usbmisc_base)
- return -ENOMEM;
+ if (IS_ERR(usbmisc_base))
+ return PTR_ERR(usbmisc_base);
imxusbmisc_data = devtype;
diff --git a/drivers/usb/imx/imx-usb-phy.c b/drivers/usb/imx/imx-usb-phy.c
index 837c1b5176..8ea08144d4 100644
--- a/drivers/usb/imx/imx-usb-phy.c
+++ b/drivers/usb/imx/imx-usb-phy.c
@@ -71,8 +71,8 @@ static int imx_usbphy_probe(struct device_d *dev)
imxphy = xzalloc(sizeof(*imxphy));
imxphy->base = dev_request_mem_region(dev, 0);
- if (!imxphy->base) {
- ret = -ENODEV;
+ if (IS_ERR(imxphy->base)) {
+ ret = PTR_ERR(imxphy->base);
goto err_free;
}
diff --git a/drivers/usb/musb/phy-am335x.c b/drivers/usb/musb/phy-am335x.c
index 2d58bbedb4..0a0b01dd27 100644
--- a/drivers/usb/musb/phy-am335x.c
+++ b/drivers/usb/musb/phy-am335x.c
@@ -37,8 +37,8 @@ static int am335x_phy_probe(struct device_d *dev)
return -ENOMEM;
am_usbphy->base = dev_request_mem_region(dev, 0);
- if (!am_usbphy->base) {
- ret = -ENODEV;
+ if (IS_ERR(am_usbphy->base)) {
+ ret = PTR_ERR(am_usbphy->base);
goto err_free;
}