diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2006-01-09 22:01:30 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2006-01-09 22:01:30 -0800 |
| commit | 2c9d0960a5ca4ded47926e03ff33edd220c8c31d (patch) | |
| tree | 97ae719a8ddb5239d2b3abdebd0982571b490153 /usb | |
| parent | 0449fc80aa4f6476f9aba0cd0229025c1f5da35c (diff) | |
| download | patches-2c9d0960a5ca4ded47926e03ff33edd220c8c31d.tar.gz | |
added bus probe patch series
Diffstat (limited to 'usb')
| -rw-r--r-- | usb/usb-serial-dynamic-id.patch | 27 |
1 files changed, 15 insertions, 12 deletions
diff --git a/usb/usb-serial-dynamic-id.patch b/usb/usb-serial-dynamic-id.patch index fcb1036b6b631..c0b8f3d9264c2 100644 --- a/usb/usb-serial-dynamic-id.patch +++ b/usb/usb-serial-dynamic-id.patch @@ -15,13 +15,13 @@ reuse much of the dynamic id logic. Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> - drivers/usb/core/driver.c | 37 ++++++++++++++++-------------- - drivers/usb/serial/bus.c | 49 ++++++++++++++++++++++++++++++++++++++++ + drivers/usb/core/driver.c | 37 ++++++++++++++++------------- + drivers/usb/serial/bus.c | 50 ++++++++++++++++++++++++++++++++++++++++ drivers/usb/serial/pl2303.c | 4 +-- - drivers/usb/serial/usb-serial.c | 43 ++++++++++++++++++++++++++++++----- + drivers/usb/serial/usb-serial.c | 43 +++++++++++++++++++++++++++++----- drivers/usb/serial/usb-serial.h | 2 + include/linux/usb.h | 13 ++++++++++ - 6 files changed, 123 insertions(+), 25 deletions(-) + 6 files changed, 124 insertions(+), 25 deletions(-) --- --- gregkh-2.6.orig/drivers/usb/core/driver.c @@ -174,8 +174,8 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> --- gregkh-2.6.orig/drivers/usb/serial/bus.c +++ gregkh-2.6/drivers/usb/serial/bus.c -@@ -37,9 +37,55 @@ static int usb_serial_device_match (stru - return 0; +@@ -104,11 +104,57 @@ exit: + return retval; } +#ifdef CONFIG_HOTPLUG @@ -226,20 +226,23 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> struct bus_type usb_serial_bus_type = { .name = "usb-serial", .match = usb_serial_device_match, + .probe = usb_serial_device_probe, + .remove = usb_serial_device_remove, + .drv_attrs = drv_attrs, }; - static int usb_serial_device_probe (struct device *dev) -@@ -116,6 +162,8 @@ int usb_serial_bus_register(struct usb_s + int usb_serial_bus_register(struct usb_serial_driver *driver) +@@ -116,6 +162,9 @@ int usb_serial_bus_register(struct usb_s + int retval; + driver->driver.bus = &usb_serial_bus_type; - driver->driver.probe = usb_serial_device_probe; - driver->driver.remove = usb_serial_device_remove; + spin_lock_init(&driver->dynids.lock); + INIT_LIST_HEAD(&driver->dynids.list); - ++ retval = driver_register(&driver->driver); -@@ -124,6 +172,7 @@ int usb_serial_bus_register(struct usb_s + return retval; +@@ -123,6 +172,7 @@ int usb_serial_bus_register(struct usb_s void usb_serial_bus_deregister(struct usb_serial_driver *driver) { |