diff options
author | Sascha Hauer <s.hauer@pengutronix.de> | 2014-10-02 08:54:42 +0200 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2014-10-02 08:54:42 +0200 |
commit | fa93e4fb602389c5a5d6991a86cf93ae6e92d016 (patch) | |
tree | 570dc8a12e7410fb1f87ddb473ad5a5e64240846 /drivers/usb/imx/chipidea-imx.c | |
parent | 52a0febb3dbe06e233f04d5c670fd662b85c1d95 (diff) | |
parent | d5a82eb095def58f3a19127bb08ff96d799b63a5 (diff) | |
download | barebox-fa93e4fb602389c5a5d6991a86cf93ae6e92d016.tar.gz barebox-fa93e4fb602389c5a5d6991a86cf93ae6e92d016.tar.xz |
Merge branch 'for-next/resource-err-ptr'
Diffstat (limited to 'drivers/usb/imx/chipidea-imx.c')
-rw-r--r-- | drivers/usb/imx/chipidea-imx.c | 5 |
1 files changed, 3 insertions, 2 deletions
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; |