diff options
| author | Ben Dooks <ben.dooks@codethink.co.uk> | 2014-06-17 16:14:58 +0100 |
|---|---|---|
| committer | Felipe Balbi <balbi@ti.com> | 2014-06-30 12:26:21 -0500 |
| commit | 776976a67ae25d18be42794fd783a50757402cbe (patch) | |
| tree | b874df118797d8feea22c2a2fda3ac64fb210ff0 /drivers/usb/gadget/r8a66597-udc.c | |
| parent | 9a6d5d4475d8c0ef5e59fecf9f425e786a914dbc (diff) | |
| download | op-kernel-dev-776976a67ae25d18be42794fd783a50757402cbe.zip op-kernel-dev-776976a67ae25d18be42794fd783a50757402cbe.tar.gz | |
usb: gadget: r8a66597-udc: cleanup error path
With the updates for devm, the cleanup path no longer needs to
check for NULL device state, so remove it and return directly
if the irq resource missing
Signed-off-by: Ben Dooks <ben.dooks@codethink.co.uk>
Signed-off-by: Felipe Balbi <balbi@ti.com>
Diffstat (limited to 'drivers/usb/gadget/r8a66597-udc.c')
| -rw-r--r-- | drivers/usb/gadget/r8a66597-udc.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/drivers/usb/gadget/r8a66597-udc.c b/drivers/usb/gadget/r8a66597-udc.c index 2662853..9ebe2c0 100644 --- a/drivers/usb/gadget/r8a66597-udc.c +++ b/drivers/usb/gadget/r8a66597-udc.c @@ -1878,9 +1878,8 @@ static int __init r8a66597_probe(struct platform_device *pdev) irq_trigger = ires->flags & IRQF_TRIGGER_MASK; if (irq < 0) { - ret = -ENODEV; dev_err(dev, "platform_get_irq error.\n"); - goto clean_up; + return -ENODEV; } /* initialize ucd */ @@ -1979,11 +1978,8 @@ clean_up2: clk_put(r8a66597->clk); } clean_up: - if (r8a66597) { - if (r8a66597->ep0_req) - r8a66597_free_request(&r8a66597->ep[0].ep, - r8a66597->ep0_req); - } + if (r8a66597->ep0_req) + r8a66597_free_request(&r8a66597->ep[0].ep, r8a66597->ep0_req); return ret; } |
