---

yaml --- r: 104629 b: refs/heads/master c: ac90e36 h: refs/heads/master i: 104627: a7611a9 v: v3
git-mirror · Jul 21, 2008 · 930e6c7 · 930e6c7
1 parent 1b35b20
commit 930e6c7
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c24f42276b4c4467e82cdd5a941fb7f9400aeea0
+refs/heads/master: ac90e36592ea5171c4e70f58b39a782d871a7d9f
diff --git a/trunk/drivers/usb/gadget/cdc2.c b/trunk/drivers/usb/gadget/cdc2.c
@@ -124,7 +124,7 @@ static int __init cdc_do_config(struct usb_configuration *c)
 		return status;
 
 	status = acm_bind_config(c, 0);
-	if (status == 0)
+	if (status < 0)
 		return status;
 
 	return 0;

diff --git a/trunk/drivers/usb/gadget/u_serial.c b/trunk/drivers/usb/gadget/u_serial.c
@@ -1090,6 +1090,9 @@ void gserial_cleanup(void)
 	unsigned	i;
 	struct gs_port	*port;
 
+	if (!gs_tty_driver)
+		return;
+
 	/* start sysfs and /dev/ttyGS* node removal */
 	for (i = 0; i < n_ports; i++)
 		tty_unregister_device(gs_tty_driver, i);