From 930e6c74115567430e40c4524aa759bafecaf7d4 Mon Sep 17 00:00:00 2001
From: David Brownell <david-b@pacbell.net>
Date: Tue, 1 Jul 2008 13:18:20 -0700
Subject: [PATCH] --- yaml --- r: 104629 b: refs/heads/master c:
 ac90e36592ea5171c4e70f58b39a782d871a7d9f h: refs/heads/master i:   104627:
 a7611a9a3ca4988ef9e773256c65dadb284c32ef v: v3

---
 [refs]                              | 2 +-
 trunk/drivers/usb/gadget/cdc2.c     | 2 +-
 trunk/drivers/usb/gadget/u_serial.c | 3 +++
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index c0624ca97016..7dfa239b2afe 100644
--- 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
index 289c75277135..d490d0289507 100644
--- 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
index 88d4f5452c49..abf9505d3a75 100644
--- 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);