From 80e0643bc611854f9c7e5734038c792821cfe45a Mon Sep 17 00:00:00 2001 From: Alan Stern Date: Thu, 31 May 2012 17:03:52 -0400 Subject: [PATCH] --- yaml --- r: 310907 b: refs/heads/master c: 0b84704a2d6fdf55a3dcdd2a1f2ac8b48913c84b h: refs/heads/master i: 310905: de40eabecf72606d6f092aed95be8d5247b8e0cd 310903: 36aeb4f216ab64bbdd0530cfbc6ce7b4da72cf04 v: v3 --- [refs] | 2 +- trunk/drivers/usb/serial/generic.c | 10 ++-------- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/[refs] b/[refs] index c0ca6d95546f..83d50c595e5c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 954c3f8a5f1b7716be9eee978b3bc85bae92d7c8 +refs/heads/master: 0b84704a2d6fdf55a3dcdd2a1f2ac8b48913c84b diff --git a/trunk/drivers/usb/serial/generic.c b/trunk/drivers/usb/serial/generic.c index 105a6d898ca4..9b026bf7afef 100644 --- a/trunk/drivers/usb/serial/generic.c +++ b/trunk/drivers/usb/serial/generic.c @@ -39,13 +39,6 @@ MODULE_PARM_DESC(product, "User specified USB idProduct"); static struct usb_device_id generic_device_ids[2]; /* Initially all zeroes. */ -/* we want to look at all devices, as the vendor/product id can change - * depending on the command line argument */ -static const struct usb_device_id generic_serial_ids[] = { - {.driver_info = 42}, - {} -}; - /* All of the device info needed for the Generic Serial Converter */ struct usb_serial_driver usb_serial_generic_device = { .driver = { @@ -79,7 +72,8 @@ int usb_serial_generic_register(int _debug) USB_DEVICE_ID_MATCH_VENDOR | USB_DEVICE_ID_MATCH_PRODUCT; /* register our generic driver with ourselves */ - retval = usb_serial_register_drivers(serial_drivers, "usbserial_generic", generic_serial_ids); + retval = usb_serial_register_drivers(serial_drivers, + "usbserial_generic", generic_device_ids); #endif return retval; }