diff options
| author | Mariusz Kozlowski <m.kozlowski@tuxland.pl> | 2006-11-17 17:49:22 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2006-12-01 23:23:37 +0100 |
| commit | 2e46b74852446404d64b0b00ce872724bfa627ab (patch) | |
| tree | 8594d2e2f42eb40c3eac30bb7fe45adeb89cf045 /drivers/usb | |
| parent | USB: add ehci_hcd.ignore_oc parameter (diff) | |
| download | linux-2e46b74852446404d64b0b00ce872724bfa627ab.tar.xz linux-2e46b74852446404d64b0b00ce872724bfa627ab.zip | |
usb: cypress_m8 init error path fix
If at some point cypress_init() fails deregister
only the resources that were registered until that point.
Signed-off-by: Mariusz Kozlowski <m.kozlowski@tuxland.pl>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/usb')
| -rw-r--r-- | drivers/usb/serial/cypress_m8.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/drivers/usb/serial/cypress_m8.c b/drivers/usb/serial/cypress_m8.c index f2e89a083659..093f303b3189 100644 --- a/drivers/usb/serial/cypress_m8.c +++ b/drivers/usb/serial/cypress_m8.c @@ -1684,15 +1684,14 @@ static int __init cypress_init(void) info(DRIVER_DESC " " DRIVER_VERSION); return 0; + failed_usb_register: - usb_deregister(&cypress_driver); -failed_ca42v2_register: usb_serial_deregister(&cypress_ca42v2_device); -failed_hidcom_register: +failed_ca42v2_register: usb_serial_deregister(&cypress_hidcom_device); -failed_em_register: +failed_hidcom_register: usb_serial_deregister(&cypress_earthmate_device); - +failed_em_register: return retval; } |