diff options
author | Ben Dooks <ben.dooks@codethink.co.uk> | 2014-06-17 16:15:01 +0100 |
---|---|---|
committer | Felipe Balbi <balbi@ti.com> | 2014-06-30 12:26:32 -0500 |
commit | 885162d171841ed7c7b25f26e72ca6def5cdfc4d (patch) | |
tree | f2827eacf517779b7888ec299674873af0ad4197 | |
parent | 4b526951c356c9270f1737ca4e100e9b420d8223 (diff) | |
download | op-kernel-dev-885162d171841ed7c7b25f26e72ca6def5cdfc4d.zip op-kernel-dev-885162d171841ed7c7b25f26e72ca6def5cdfc4d.tar.gz |
usb: gadget: r8a66597-udc: remove now unused clean_up and clean_up3 label.
With the devm additions, the clean_up and clean_up3 are now
not needed or used. Change clean_up3 and make everything use
clean_up2 and just remove clean_up.
Signed-off-by: Ben Dooks <ben.dooks@codethink.co.uk>
Signed-off-by: Felipe Balbi <balbi@ti.com>
-rw-r--r-- | drivers/usb/gadget/r8a66597-udc.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/usb/gadget/r8a66597-udc.c b/drivers/usb/gadget/r8a66597-udc.c index 8414ba5..6ad6028 100644 --- a/drivers/usb/gadget/r8a66597-udc.c +++ b/drivers/usb/gadget/r8a66597-udc.c @@ -1954,7 +1954,7 @@ static int __init r8a66597_probe(struct platform_device *pdev) GFP_KERNEL); if (r8a66597->ep0_req == NULL) { ret = -ENOMEM; - goto clean_up3; + goto clean_up2; } r8a66597->ep0_req->complete = nop_completion; @@ -1967,11 +1967,10 @@ static int __init r8a66597_probe(struct platform_device *pdev) err_add_udc: r8a66597_free_request(&r8a66597->ep[0].ep, r8a66597->ep0_req); -clean_up3: clean_up2: if (r8a66597->pdata->on_chip) clk_disable_unprepare(r8a66597->clk); -clean_up: + if (r8a66597->ep0_req) r8a66597_free_request(&r8a66597->ep[0].ep, r8a66597->ep0_req); |