diff options
Diffstat (limited to 'drivers/usb/serial/generic.c')
| -rw-r--r-- | drivers/usb/serial/generic.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/drivers/usb/serial/generic.c b/drivers/usb/serial/generic.c index 105a6d898ca4..9b026bf7afef 100644 --- a/drivers/usb/serial/generic.c +++ b/drivers/usb/serial/generic.c | |||
| @@ -39,13 +39,6 @@ MODULE_PARM_DESC(product, "User specified USB idProduct"); | |||
| 39 | 39 | ||
| 40 | static struct usb_device_id generic_device_ids[2]; /* Initially all zeroes. */ | 40 | static struct usb_device_id generic_device_ids[2]; /* Initially all zeroes. */ |
| 41 | 41 | ||
| 42 | /* we want to look at all devices, as the vendor/product id can change | ||
| 43 | * depending on the command line argument */ | ||
| 44 | static const struct usb_device_id generic_serial_ids[] = { | ||
| 45 | {.driver_info = 42}, | ||
| 46 | {} | ||
| 47 | }; | ||
| 48 | |||
| 49 | /* All of the device info needed for the Generic Serial Converter */ | 42 | /* All of the device info needed for the Generic Serial Converter */ |
| 50 | struct usb_serial_driver usb_serial_generic_device = { | 43 | struct usb_serial_driver usb_serial_generic_device = { |
| 51 | .driver = { | 44 | .driver = { |
| @@ -79,7 +72,8 @@ int usb_serial_generic_register(int _debug) | |||
| 79 | USB_DEVICE_ID_MATCH_VENDOR | USB_DEVICE_ID_MATCH_PRODUCT; | 72 | USB_DEVICE_ID_MATCH_VENDOR | USB_DEVICE_ID_MATCH_PRODUCT; |
| 80 | 73 | ||
| 81 | /* register our generic driver with ourselves */ | 74 | /* register our generic driver with ourselves */ |
| 82 | retval = usb_serial_register_drivers(serial_drivers, "usbserial_generic", generic_serial_ids); | 75 | retval = usb_serial_register_drivers(serial_drivers, |
| 76 | "usbserial_generic", generic_device_ids); | ||
| 83 | #endif | 77 | #endif |
| 84 | return retval; | 78 | return retval; |
| 85 | } | 79 | } |
