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

[linux-2.6-block.git] / drivers / usb / gadget / s3c-hsudc.c

diff --git a/drivers/usb/gadget/s3c-hsudc.c b/drivers/usb/gadget/s3c-hsudc.c
index 3ed5a397296f1d0f547dc5c2a6b14f70ef330a9f..458965a1b138febdd0dde37fcba7a3a2fa00bc77 100644 (file)
--- a/drivers/usb/gadget/s3c-hsudc.c
+++ b/drivers/usb/gadget/s3c-hsudc.c
@@ -1295,10 +1295,9 @@ static int s3c_hsudc_probe(struct platform_device *pdev)
 
        res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
 
-       hsudc->regs = devm_request_and_ioremap(&pdev->dev, res);
-       if (!hsudc->regs) {
-               dev_err(dev, "error mapping device register area\n");
-               ret = -EBUSY;
+       hsudc->regs = devm_ioremap_resource(&pdev->dev, res);
+       if (IS_ERR(hsudc->regs)) {
+               ret = PTR_ERR(hsudc->regs);
                goto err_res;
        }