From 06e722b91f3991324f5328556eafd55290a97fcb Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Fri, 27 Mar 2015 16:03:16 +0000 Subject: [PATCH] gemini: fix usb driver compilation on 3.18 Signed-off-by: Roman Yeryomin git-svn-id: svn://svn.openwrt.org/openwrt/trunk@45065 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- target/linux/gemini/files/drivers/usb/host/ehci-fotg2.c | 4 ++-- 1 file 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; } -- 2.11.0