Merge branch 'for-next/resource-err-ptr'

5 files changed, 16 insertions, 4 deletions

diff --git a/drivers/usb/gadget/at91_udc.c b/drivers/usb/gadget/at91_udc.c
index a6745cb725..60e1ff79d3 100644
--- a/drivers/usb/gadget/at91_udc.c
+++ b/drivers/usb/gadget/at91_udc.c
@@ -1423,8 +1423,8 @@ static int __init at91udc_probe(struct device_d *dev)
 	}
 
 	udc->udp_baseaddr = dev_request_mem_region(dev, 0);
-	if (!udc->udp_baseaddr) {
-		retval = -ENOMEM;
+	if (IS_ERR(udc->udp_baseaddr)) {
+		retval = PTR_ERR(udc->udp_baseaddr);
 		goto fail0a;
 	}
 
diff --git a/drivers/usb/gadget/fsl_udc.c b/drivers/usb/gadget/fsl_udc.c
index 324d3282d7..d067f03a40 100644
--- a/drivers/usb/gadget/fsl_udc.c
+++ b/drivers/usb/gadget/fsl_udc.c
@@ -8,6 +8,7 @@
 #include <usb/fsl_usb2.h>
 #include <io.h>
 #include <asm/byteorder.h>
+#include <linux/err.h>
 
 /* ### define USB registers here
  */
@@ -2292,6 +2293,9 @@ static int fsl_udc_probe(struct device_d *dev)
 {
 	void __iomem *regs = dev_request_mem_region(dev, 0);
 
+	if (IS_ERR(regs))
+		return PTR_ERR(regs);
+
 	return ci_udc_register(dev, regs);
 }
 
diff --git a/drivers/usb/host/ehci-hcd.c b/drivers/usb/host/ehci-hcd.c
index c0ea8d013a..5624552c00 100644
--- a/drivers/usb/host/ehci-hcd.c
+++ b/drivers/usb/host/ehci-hcd.c
@@ -30,6 +30,7 @@
 #include <of.h>
 #include <usb/ehci.h>
 #include <asm/mmu.h>
+#include <linux/err.h>
 
 #include "ehci.h"
 
@@ -924,6 +925,9 @@ static int ehci_probe(struct device_d *dev)
 		data.flags = EHCI_HAS_TT;
 
 	data.hccr = dev_request_mem_region(dev, 0);
+	if (IS_ERR(data.hccr))
+		return PTR_ERR(data.hccr);
+
 	if (dev->num_resources > 1)
 		data.hcor = dev_request_mem_region(dev, 1);
 	else
diff --git a/drivers/usb/host/ohci-hcd.c b/drivers/usb/host/ohci-hcd.c
index 3d18a73325..622f5c3a5b 100644
--- a/drivers/usb/host/ohci-hcd.c
+++ b/drivers/usb/host/ohci-hcd.c
@@ -47,6 +47,7 @@
 #include <usb/usb_defs.h>
 #include <init.h>
 #include <errno.h>
+#include <linux/err.h>
 
 #include <asm/byteorder.h>
 #include <io.h>
@@ -1812,6 +1813,8 @@ static int ohci_probe(struct device_d *dev)
 	usb_register_host(host);
 
 	ohci->regs = dev_request_mem_region(dev, 0);
+	if (IS_ERR(ohci->regs))
+		return PTR_ERR(ohci->regs);
 
 	return 0;
 }
diff --git a/drivers/usb/imx/chipidea-imx.c b/drivers/usb/imx/chipidea-imx.c
index 959f5ba0dc..1dca6bfe1d 100644
--- a/drivers/usb/imx/chipidea-imx.c
+++ b/drivers/usb/imx/chipidea-imx.c
@@ -25,6 +25,7 @@
 #include <usb/phy.h>
 #include <usb/ulpi.h>
 #include <usb/fsl_usb2.h>
+#include <linux/err.h>
 
 #define MXC_EHCI_PORTSC_MASK ((0xf << 28) | (1 << 25))
 
@@ -243,8 +244,8 @@ static int imx_chipidea_probe(struct device_d *dev)
 	regulator_enable(ci->vbus);
 
 	base = dev_request_mem_region(dev, 0);
-	if (!base)
-		return -ENODEV;
+	if (IS_ERR(base))
+		return PTR_ERR(base);
 
 	ci->base = base;