diff options
| author | Brian Norris <computersforpeace@gmail.com> | 2014-09-16 03:28:16 +0400 |
|---|---|---|
| committer | Brian Norris <computersforpeace@gmail.com> | 2014-09-16 03:28:16 +0400 |
| commit | 7622d4905a038961da6b1c6c3fe4be6c3dad7ef9 (patch) | |
| tree | cce9f4bc0ef2de31cee8e06e2cd6358dd51fa9c5 /drivers/usb/gadget/udc/r8a66597-udc.c | |
| parent | 5b49ab3e03f68eb49db4bce6290e5707b7f6c6f3 (diff) | |
| parent | 9e82bf014195d6f0054982c463575cdce24292be (diff) | |
| download | linux-7622d4905a038961da6b1c6c3fe4be6c3dad7ef9.tar.xz | |
Merge tag 'v3.17-rc5' from upstream
Diffstat (limited to 'drivers/usb/gadget/udc/r8a66597-udc.c')
| -rw-r--r-- | drivers/usb/gadget/udc/r8a66597-udc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/usb/gadget/udc/r8a66597-udc.c b/drivers/usb/gadget/udc/r8a66597-udc.c index 46008421c1ec..de2a8713b428 100644 --- a/drivers/usb/gadget/udc/r8a66597-udc.c +++ b/drivers/usb/gadget/udc/r8a66597-udc.c @@ -1868,8 +1868,8 @@ static int r8a66597_probe(struct platform_device *pdev) res = platform_get_resource(pdev, IORESOURCE_MEM, 0); reg = devm_ioremap_resource(&pdev->dev, res); - if (!reg) - return -ENODEV; + if (IS_ERR(reg)) + return PTR_ERR(reg); ires = platform_get_resource(pdev, IORESOURCE_IRQ, 0); irq = ires->start; |