From: nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Fri, 27 Mar 2015 16:03:16 +0000 (+0000)
Subject: gemini: fix usb driver compilation on 3.18
X-Git-Url: http://207.154.207.93/?a=commitdiff_plain;h=72dec64d9c44d479d81848f9e7a309539a681486;p=openwrt.git

gemini: fix usb driver compilation on 3.18

Signed-off-by: Roman Yeryomin <roman@advem.lv>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@45065 3c298f89-4303-0410-b956-a3cf2f4a3e73
---

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;
 	}