---

yaml --- r: 133517 b: refs/heads/master c: e4abe66 h: refs/heads/master i: 133515: edbc8bc v: v3
git-mirror · Mar 24, 2009 · 33e44b2 · 33e44b2
1 parent 59312f8
commit 33e44b2
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git 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
@@ -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)