diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2016-03-11 10:49:48 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2016-03-11 10:49:48 +0100 |
| commit | 690ec1804cc8acbcc1afe3cc132dfcabfc7d11d5 (patch) | |
| tree | a4b1bc34272ef576fe876b8edf9073bcc687293d /drivers/usb/imx/imx-usb-phy.c | |
| parent | d69ea86d795aea0ad833f271f0690e5e02b8bbb6 (diff) | |
| parent | 3bd69ad077a955b469baa90d938fd83510297335 (diff) | |
| download | barebox-690ec1804cc8acbcc1afe3cc132dfcabfc7d11d5.tar.gz barebox-690ec1804cc8acbcc1afe3cc132dfcabfc7d11d5.tar.xz | |
Merge branch 'for-next/driver'
Diffstat (limited to 'drivers/usb/imx/imx-usb-phy.c')
| -rw-r--r-- | drivers/usb/imx/imx-usb-phy.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/drivers/usb/imx/imx-usb-phy.c b/drivers/usb/imx/imx-usb-phy.c index 3fe94868bc..1aa12be29d 100644 --- a/drivers/usb/imx/imx-usb-phy.c +++ b/drivers/usb/imx/imx-usb-phy.c @@ -65,16 +65,18 @@ static int imx_usbphy_enable(struct imx_usbphy *imxphy) static int imx_usbphy_probe(struct device_d *dev) { + struct resource *iores; int ret; struct imx_usbphy *imxphy; imxphy = xzalloc(sizeof(*imxphy)); - imxphy->base = dev_request_mem_region(dev, 0); - if (!imxphy->base) { - ret = -ENODEV; + iores = dev_request_mem_resource(dev, 0); + if (IS_ERR(iores)) { + ret = PTR_ERR(iores); goto err_free; } + imxphy->base = IOMEM(iores->start); imxphy->clk = clk_get(dev, NULL); if (IS_ERR(imxphy->clk)) { |