diff options
author | Mariusz Kozlowski <m.kozlowski@tuxland.pl> | 2006-11-17 11:49:22 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2006-12-01 17:23:37 -0500 |
commit | 2e46b74852446404d64b0b00ce872724bfa627ab (patch) | |
tree | 8594d2e2f42eb40c3eac30bb7fe45adeb89cf045 /drivers/usb/serial/cypress_m8.c | |
parent | 93f1a47c4af34c4ee014b3d2aae70089b3b69f72 (diff) |
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/serial/cypress_m8.c')
-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) | |||
1684 | 1684 | ||
1685 | info(DRIVER_DESC " " DRIVER_VERSION); | 1685 | info(DRIVER_DESC " " DRIVER_VERSION); |
1686 | return 0; | 1686 | return 0; |
1687 | |||
1687 | failed_usb_register: | 1688 | failed_usb_register: |
1688 | usb_deregister(&cypress_driver); | ||
1689 | failed_ca42v2_register: | ||
1690 | usb_serial_deregister(&cypress_ca42v2_device); | 1689 | usb_serial_deregister(&cypress_ca42v2_device); |
1691 | failed_hidcom_register: | 1690 | failed_ca42v2_register: |
1692 | usb_serial_deregister(&cypress_hidcom_device); | 1691 | usb_serial_deregister(&cypress_hidcom_device); |
1693 | failed_em_register: | 1692 | failed_hidcom_register: |
1694 | usb_serial_deregister(&cypress_earthmate_device); | 1693 | usb_serial_deregister(&cypress_earthmate_device); |
1695 | 1694 | failed_em_register: | |
1696 | return retval; | 1695 | return retval; |
1697 | } | 1696 | } |
1698 | 1697 | ||