From 33e44b2a7aeb5dce17dbc0182d48def11c303ad9 Mon Sep 17 00:00:00 2001
From: Dave Young <hidave.darkstar@gmail.com>
Date: Sat, 14 Feb 2009 21:21:13 +0800
Subject: [PATCH] --- yaml --- r: 133517 b: refs/heads/master c:
 e4abe6658aa17a5d7e7321dfda807d287255511b h: refs/heads/master i:   133515:
 edbc8bcc984f60c2b47d17451da0ce2ddb87f7b7 v: v3

---
 [refs]                                | 2 +-
 trunk/drivers/usb/serial/usb-serial.c | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 1ca5a0c087de..376e63abdf50 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d0626808f7a6181c1c750d261da9a7a845c29e13
+refs/heads/master: e4abe6658aa17a5d7e7321dfda807d287255511b
diff --git a/trunk/drivers/usb/serial/usb-serial.c b/trunk/drivers/usb/serial/usb-serial.c
index 73172898ccb3..742a5bc44be8 100644
--- a/trunk/drivers/usb/serial/usb-serial.c
+++ b/trunk/drivers/usb/serial/usb-serial.c
@@ -1241,6 +1241,9 @@ int usb_serial_register(struct usb_serial_driver *driver)
 	/* must be called with BKL held */
 	int retval;
 
+	if (usb_disabled())
+		return -ENODEV;
+
 	fixup_generic(driver);
 
 	if (!driver->description)