Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 7990
b: refs/heads/master
c: d5ae36d
h: refs/heads/master
v: v3
  • Loading branch information
Greg Kroah-Hartman committed Sep 8, 2005
1 parent 921fab9 commit d376a64
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 3 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: aca951a22a1d93ebe31b54052b3eb9a8196df2fc
refs/heads/master: d5ae36dd439549305f00a755556f49c9fa7bb237
7 changes: 5 additions & 2 deletions trunk/drivers/usb/input/yealink.c
Original file line number Diff line number Diff line change
Expand Up @@ -840,9 +840,12 @@ static void usb_disconnect(struct usb_interface *intf)
static int usb_match(struct usb_device *udev)
{
int i;
u16 idVendor = le16_to_cpu(udev->descriptor.idVendor);
u16 idProduct = le16_to_cpu(udev->descriptor.idProduct);

for (i = 0; i < ARRAY_SIZE(yld_device); i++) {
if ((udev->descriptor.idVendor == yld_device[i].idVendor) &&
(udev->descriptor.idProduct == yld_device[i].idProduct))
if ((idVendor == yld_device[i].idVendor) &&
(idProduct == yld_device[i].idProduct))
return i;
}
return -ENODEV;
Expand Down

0 comments on commit d376a64

Please sign in to comment.