git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
vserver 1.9.5.x5
[linux-2.6.git]
/
drivers
/
usb
/
serial
/
bus.c
diff --git
a/drivers/usb/serial/bus.c
b/drivers/usb/serial/bus.c
index
003e101
..
2f612c2
100644
(file)
--- a/
drivers/usb/serial/bus.c
+++ b/
drivers/usb/serial/bus.c
@@
-14,13
+14,6
@@
#include <linux/tty.h>
#include <linux/module.h>
#include <linux/usb.h>
#include <linux/tty.h>
#include <linux/module.h>
#include <linux/usb.h>
-
-#ifdef CONFIG_USB_SERIAL_DEBUG
- static int debug = 1;
-#else
- static int debug;
-#endif
-
#include "usb-serial.h"
static int usb_serial_device_match (struct device *dev, struct device_driver *drv)
#include "usb-serial.h"
static int usb_serial_device_match (struct device *dev, struct device_driver *drv)
@@
-78,8
+71,8
@@
static int usb_serial_device_probe (struct device *dev)
minor = port->number;
tty_register_device (usb_serial_tty_driver, minor, dev);
dev_info(&port->serial->dev->dev,
minor = port->number;
tty_register_device (usb_serial_tty_driver, minor, dev);
dev_info(&port->serial->dev->dev,
- "%s converter now attached to ttyUSB%d
(or usb/tts/%d for devfs)
\n",
- driver->name, minor
, minor
);
+ "%s converter now attached to ttyUSB%d\n",
+ driver->name, minor);
exit:
return retval;
exit:
return retval;
@@
-127,6
+120,7
@@
int usb_serial_bus_register(struct usb_serial_device_type *device)
device->driver.bus = &usb_serial_bus_type;
device->driver.probe = usb_serial_device_probe;
device->driver.remove = usb_serial_device_remove;
device->driver.bus = &usb_serial_bus_type;
device->driver.probe = usb_serial_device_probe;
device->driver.remove = usb_serial_device_remove;
+ device->driver.owner = device->owner;
retval = driver_register(&device->driver);
retval = driver_register(&device->driver);