diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-06-13 15:22:54 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-06-13 15:22:54 -0700 |
| commit | e17f8af316525c2a795bb314dfcc23201fb51ef4 (patch) | |
| tree | 99ea9c56dc9e8fc6485d0513e71aacdb50a19792 /drivers/usb/serial/usb-serial.c | |
| parent | a276400d14bb5b98a5db1d87bbee7b1621abe4a1 (diff) | |
| parent | 0b84704a2d6fdf55a3dcdd2a1f2ac8b48913c84b (diff) | |
| download | linux-stable-e17f8af316525c2a795bb314dfcc23201fb51ef4.tar.gz linux-stable-e17f8af316525c2a795bb314dfcc23201fb51ef4.tar.bz2 linux-stable-e17f8af316525c2a795bb314dfcc23201fb51ef4.zip | |
Merge branch 'usb-linus' into usb-next
This is to pick up the changes to the option driver, which are needed
for follow-on patches from Johan.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/usb/serial/usb-serial.c')
| -rw-r--r-- | drivers/usb/serial/usb-serial.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/usb/serial/usb-serial.c b/drivers/usb/serial/usb-serial.c index 6a1b609a0d94..6e8c527e07c9 100644 --- a/drivers/usb/serial/usb-serial.c +++ b/drivers/usb/serial/usb-serial.c @@ -659,12 +659,14 @@ exit: static struct usb_serial_driver *search_serial_device( struct usb_interface *iface) { - const struct usb_device_id *id; + const struct usb_device_id *id = NULL; struct usb_serial_driver *drv; + struct usb_driver *driver = to_usb_driver(iface->dev.driver); /* Check if the usb id matches a known device */ list_for_each_entry(drv, &usb_serial_driver_list, driver_list) { - id = get_iface_id(drv, iface); + if (drv->usb_driver == driver) + id = get_iface_id(drv, iface); if (id) return drv; } |