aboutsummaryrefslogtreecommitdiffstats
path: root/target
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2015-03-27 16:03:16 +0000
committerFelix Fietkau <nbd@openwrt.org>2015-03-27 16:03:16 +0000
commitc6a29d2528db2b5c0504d0eaaf80e65b92edd303 (patch)
tree1f31469f53c692f7b9ff0908cde38da41aefa02a /target
parentb67719f571635a29391b369f0df42c27428fb3ad (diff)
downloadupstream-c6a29d2528db2b5c0504d0eaaf80e65b92edd303.tar.gz
upstream-c6a29d2528db2b5c0504d0eaaf80e65b92edd303.tar.bz2
upstream-c6a29d2528db2b5c0504d0eaaf80e65b92edd303.zip
gemini: fix usb driver compilation on 3.18
Signed-off-by: Roman Yeryomin <roman@advem.lv> SVN-Revision: 45065
Diffstat (limited to 'target')
-rw-r--r--target/linux/gemini/files/drivers/usb/host/ehci-fotg2.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/gemini/files/drivers/usb/host/ehci-fotg2.c b/target/linux/gemini/files/drivers/usb/host/ehci-fotg2.c
index 4d95f2e5c8..0717abce9c 100644
--- a/target/linux/gemini/files/drivers/usb/host/ehci-fotg2.c
+++ b/target/linux/gemini/files/drivers/usb/host/ehci-fotg2.c
@@ -206,8 +206,8 @@ static int fotg2_ehci_probe(struct platform_device *pdev)
hcd->rsrc_start = res->start;
hcd->rsrc_len = resource_size(res);
- hcd->regs = devm_request_and_ioremap(&pdev->dev, res);
- if (!hcd->regs) {
+ hcd->regs = devm_ioremap_resource(&pdev->dev, res);
+ if (IS_ERR(hcd->regs)) {
err = -ENOMEM;
goto err_put_hcd;
}