diff options
author | Greg KH <gregkh@suse.de> | 2005-09-09 17:26:01 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2005-09-09 17:26:01 -0400 |
commit | 8ccc457722ba226ea72fca6f9ba3b54535d4749e (patch) | |
tree | e323eda3b7ed55a5398751021e8031c1cae56f9d /drivers/usb/input/keyspan_remote.c | |
parent | 20dd026d7f5a6972dc78b4928a99620001fa547d (diff) | |
parent | 5dce225bd9ea60e28e17076de63df0dee51b2883 (diff) |
Merge gregkh@master.kernel.org:/pub/scm/linux/kernel/git/gregkh/driver-2.6
Diffstat (limited to 'drivers/usb/input/keyspan_remote.c')
-rw-r--r-- | drivers/usb/input/keyspan_remote.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/drivers/usb/input/keyspan_remote.c b/drivers/usb/input/keyspan_remote.c index 67dc93685203..99de1b33c07d 100644 --- a/drivers/usb/input/keyspan_remote.c +++ b/drivers/usb/input/keyspan_remote.c | |||
@@ -431,11 +431,6 @@ static int keyspan_probe(struct usb_interface *interface, const struct usb_devic | |||
431 | struct usb_endpoint_descriptor *endpoint; | 431 | struct usb_endpoint_descriptor *endpoint; |
432 | struct usb_device *udev = usb_get_dev(interface_to_usbdev(interface)); | 432 | struct usb_device *udev = usb_get_dev(interface_to_usbdev(interface)); |
433 | 433 | ||
434 | /* See if the offered device matches what we can accept */ | ||
435 | if ((udev->descriptor.idVendor != USB_KEYSPAN_VENDOR_ID) || | ||
436 | (udev->descriptor.idProduct != USB_KEYSPAN_PRODUCT_UIA11) ) | ||
437 | return -ENODEV; | ||
438 | |||
439 | /* allocate memory for our device state and initialize it */ | 434 | /* allocate memory for our device state and initialize it */ |
440 | remote = kmalloc(sizeof(*remote), GFP_KERNEL); | 435 | remote = kmalloc(sizeof(*remote), GFP_KERNEL); |
441 | if (remote == NULL) { | 436 | if (remote == NULL) { |