From 2e46b74852446404d64b0b00ce872724bfa627ab Mon Sep 17 00:00:00 2001 From: Mariusz Kozlowski Date: Fri, 17 Nov 2006 17:49:22 +0100 Subject: [PATCH] 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 Signed-off-by: Greg Kroah-Hartman --- drivers/usb/serial/cypress_m8.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 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: - usb_serial_deregister(&cypress_hidcom_device); -failed_em_register: - usb_serial_deregister(&cypress_earthmate_device); +failed_usb_register: + usb_serial_deregister(&cypress_ca42v2_device); +failed_ca42v2_register: + usb_serial_deregister(&cypress_hidcom_device); +failed_hidcom_register: + usb_serial_deregister(&cypress_earthmate_device); +failed_em_register: return retval; }