Merge tag 'usb-3.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb

[linux-3.10.git] / drivers / usb / gadget / s3c-hsotg.c

diff --git a/drivers/usb/gadget/s3c-hsotg.c b/drivers/usb/gadget/s3c-hsotg.c
index e97df1d094dd6be599cd4adb72ab522e380bce30..c26564f29a2cd9e5b1eb31c3b43c5c2929bc8e24 100644 (file)
--- a/drivers/usb/gadget/s3c-hsotg.c
+++ b/drivers/usb/gadget/s3c-hsotg.c
@@ -3542,10 +3542,9 @@ static int s3c_hsotg_probe(struct platform_device *pdev)
 
        res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
 
-       hsotg->regs = devm_request_and_ioremap(&pdev->dev, res);
-       if (!hsotg->regs) {
-               dev_err(dev, "cannot map registers\n");
-               ret = -ENXIO;
+       hsotg->regs = devm_ioremap_resource(&pdev->dev, res);
+       if (IS_ERR(hsotg->regs)) {
+               ret = PTR_ERR(hsotg->regs);
                goto err_clk;
        }