diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-08 17:21:02 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-08 17:21:02 -0700 |
commit | 54205209732a05f51f5fbb3eb3e5c36ac81e79d9 (patch) | |
tree | 4992850c7d5d5ed4034cbd4fe5f5ea23aeff317e /drivers/usb/input/keyspan_remote.c | |
parent | 6d8de3a26b5c20b04a9317b4446582167d5883da (diff) | |
parent | b71e318cdb1dc301d734fdd4983dfc6dc167235a (diff) | |
download | linux-3.10-54205209732a05f51f5fbb3eb3e5c36ac81e79d9.tar.gz linux-3.10-54205209732a05f51f5fbb3eb3e5c36ac81e79d9.tar.bz2 linux-3.10-54205209732a05f51f5fbb3eb3e5c36ac81e79d9.zip |
Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/usb-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 67dc9368520..99de1b33c07 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 struct usb_endpoint_descriptor *endpoint; struct usb_device *udev = usb_get_dev(interface_to_usbdev(interface)); - /* See if the offered device matches what we can accept */ - if ((udev->descriptor.idVendor != USB_KEYSPAN_VENDOR_ID) || - (udev->descriptor.idProduct != USB_KEYSPAN_PRODUCT_UIA11) ) - return -ENODEV; - /* allocate memory for our device state and initialize it */ remote = kmalloc(sizeof(*remote), GFP_KERNEL); if (remote == NULL) { |