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/usb/host | |
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/usb/host')
-rw-r--r-- | drivers/usb/host/ehci-hcd.c | 4 | ||||
-rw-r--r-- | drivers/usb/host/ohci-hcd.c | 3 |
2 files changed, 7 insertions, 0 deletions
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; } |