diff options
author | Sebastian Andrzej Siewior <bigeasy@linutronix.de> | 2011-06-03 13:50:46 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-06-06 19:28:03 -0400 |
commit | a6207b17ece4ea40c378233b1ddf2a7f4288419d (patch) | |
tree | ad745dd120764e76c96edd74a9b6c6352b41fab1 /drivers | |
parent | cb42447374eb4348b75ec677bf9c77958c7d10e0 (diff) |
usb/pxa25x_udc: cleanup the LUBBOCK err path
this is more backwords than it has to be.
Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/usb/gadget/pxa25x_udc.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/usb/gadget/pxa25x_udc.c b/drivers/usb/gadget/pxa25x_udc.c index 365c02fc25fc..774545494cf2 100644 --- a/drivers/usb/gadget/pxa25x_udc.c +++ b/drivers/usb/gadget/pxa25x_udc.c | |||
@@ -2216,7 +2216,6 @@ static int __init pxa25x_udc_probe(struct platform_device *pdev) | |||
2216 | if (retval != 0) { | 2216 | if (retval != 0) { |
2217 | pr_err("%s: can't get irq %i, err %d\n", | 2217 | pr_err("%s: can't get irq %i, err %d\n", |
2218 | driver_name, LUBBOCK_USB_DISC_IRQ, retval); | 2218 | driver_name, LUBBOCK_USB_DISC_IRQ, retval); |
2219 | lubbock_fail0: | ||
2220 | goto err_irq_lub; | 2219 | goto err_irq_lub; |
2221 | } | 2220 | } |
2222 | retval = request_irq(LUBBOCK_USB_IRQ, | 2221 | retval = request_irq(LUBBOCK_USB_IRQ, |
@@ -2226,7 +2225,6 @@ lubbock_fail0: | |||
2226 | if (retval != 0) { | 2225 | if (retval != 0) { |
2227 | pr_err("%s: can't get irq %i, err %d\n", | 2226 | pr_err("%s: can't get irq %i, err %d\n", |
2228 | driver_name, LUBBOCK_USB_IRQ, retval); | 2227 | driver_name, LUBBOCK_USB_IRQ, retval); |
2229 | free_irq(LUBBOCK_USB_DISC_IRQ, dev); | ||
2230 | goto lubbock_fail0; | 2228 | goto lubbock_fail0; |
2231 | } | 2229 | } |
2232 | } else | 2230 | } else |
@@ -2236,10 +2234,11 @@ lubbock_fail0: | |||
2236 | return 0; | 2234 | return 0; |
2237 | 2235 | ||
2238 | #ifdef CONFIG_ARCH_LUBBOCK | 2236 | #ifdef CONFIG_ARCH_LUBBOCK |
2237 | lubbock_fail0: | ||
2239 | free_irq(LUBBOCK_USB_DISC_IRQ, dev); | 2238 | free_irq(LUBBOCK_USB_DISC_IRQ, dev); |
2240 | err_irq_lub: | 2239 | err_irq_lub: |
2241 | #endif | ||
2242 | free_irq(irq, dev); | 2240 | free_irq(irq, dev); |
2241 | #endif | ||
2243 | err_irq1: | 2242 | err_irq1: |
2244 | if (gpio_is_valid(dev->mach->gpio_pullup)) | 2243 | if (gpio_is_valid(dev->mach->gpio_pullup)) |
2245 | gpio_free(dev->mach->gpio_pullup); | 2244 | gpio_free(dev->mach->gpio_pullup); |