patch-2.4.0-test11 linux/drivers/usb/dabusb.c

• Lines: 51
• Date: Sat Nov 11 18:17:09 2000
• Orig file: v2.4.0-test10/linux/drivers/usb/dabusb.c
• Orig date: Thu Sep 7 08:36:40 2000

diff -u --recursive --new-file v2.4.0-test10/linux/drivers/usb/dabusb.c linux/drivers/usb/dabusb.c
@@ -718,7 +718,8 @@
 }
 
 /* --------------------------------------------------------------------- */
-static void *dabusb_probe (struct usb_device *usbdev, unsigned int ifnum)
+static void *dabusb_probe (struct usb_device *usbdev, unsigned int ifnum,
+			   const struct usb_device_id *id)
 {
 	int devnum;
 	pdabusb_t s;
@@ -726,11 +727,6 @@
 	dbg("dabusb: probe: vendor id 0x%x, device id 0x%x ifnum:%d",
 	  usbdev->descriptor.idVendor, usbdev->descriptor.idProduct, ifnum);
 
-	/* the 1234:5678 is just a self assigned test ID */
-	if ((usbdev->descriptor.idVendor != 0x0547 || usbdev->descriptor.idProduct != 0x2131) &&
-	    (usbdev->descriptor.idVendor != 0x0547 || usbdev->descriptor.idProduct != 0x9999))
-		return NULL;
-
 	/* We don't handle multiple configurations */
 	if (usbdev->descriptor.bNumConfigurations != 1)
 		return NULL;
@@ -790,14 +786,22 @@
 	MOD_DEC_USE_COUNT;
 }
 
+static struct usb_device_id dabusb_ids [] = {
+    { idVendor: 0x0547, idProduct: 0x2131 },
+    { idVendor: 0x0547, idProduct: 0x9999 },
+    { }						/* Terminating entry */
+};
+
+MODULE_DEVICE_TABLE (usb, dabusb_ids);
+
 static struct usb_driver dabusb_driver =
 {
-	"dabusb",
-	dabusb_probe,
-	dabusb_disconnect,
-	{NULL, NULL},
-	&dabusb_fops,
-	DABUSB_MINOR
+	name:		"dabusb",
+	probe:		dabusb_probe,
+	disconnect:	dabusb_disconnect,
+	fops:		&dabusb_fops,
+	minor:		DABUSB_MINOR,
+	id_table:	dabusb_ids,
 };
 
 /* --------------------------------------------------------------------- */