summaryrefslogtreecommitdiffstats
path: root/drivers/usb/serial/aircable.c
diff options
context:
space:
mode:
authorDmitry Torokhov <dmitry.torokhov@gmail.com>2009-03-09 00:30:55 +0100
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2009-03-09 00:30:55 +0100
commitd15c22e78674f9a5bc0de0932a43abe1aafae303 (patch)
tree3e4198c44bd2d9184e91647346c66aa95e28f843 /drivers/usb/serial/aircable.c
parentInput: psmouse - add newline to OLPC HGPK touchpad debugging (diff)
parentLinux 2.6.29-rc7 (diff)
downloadlinux-d15c22e78674f9a5bc0de0932a43abe1aafae303.tar.xz
linux-d15c22e78674f9a5bc0de0932a43abe1aafae303.zip
Merge commit 'v2.6.29-rc7' into next
Diffstat (limited to 'drivers/usb/serial/aircable.c')
-rw-r--r--drivers/usb/serial/aircable.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/usb/serial/aircable.c b/drivers/usb/serial/aircable.c
index 537f953bd7f8..6d106e74265e 100644
--- a/drivers/usb/serial/aircable.c
+++ b/drivers/usb/serial/aircable.c
@@ -621,9 +621,9 @@ static int __init aircable_init(void)
goto failed_usb_register;
return 0;
-failed_serial_register:
- usb_serial_deregister(&aircable_device);
failed_usb_register:
+ usb_serial_deregister(&aircable_device);
+failed_serial_register:
return retval;
}