From 56c4bb65fc57fa96b15fbeed2511377bae1f7d5c Mon Sep 17 00:00:00 2001 From: Frank Schaefer Date: Fri, 19 Apr 2013 17:09:46 -0300 Subject: [PATCH] --- yaml --- r: 367076 b: refs/heads/master c: 1552fb344d5ddd5178e8774a31fdb08765c668e1 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/media/usb/em28xx/em28xx-cards.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 0276716f808f..3450f4c40adb 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 16af690fb071594ee7e261728bab470f3424d314 +refs/heads/master: 1552fb344d5ddd5178e8774a31fdb08765c668e1 diff --git a/trunk/drivers/media/usb/em28xx/em28xx-cards.c b/trunk/drivers/media/usb/em28xx/em28xx-cards.c index cc63f1963de5..d2ed67825993 100644 --- a/trunk/drivers/media/usb/em28xx/em28xx-cards.c +++ b/trunk/drivers/media/usb/em28xx/em28xx-cards.c @@ -2910,7 +2910,8 @@ static int em28xx_init_dev(struct em28xx *dev, struct usb_device *udev, break; case CHIP_ID_EM2820: chip_name = "em2710/2820"; - if (dev->udev->descriptor.idVendor == 0xeb1a) { + if (le16_to_cpu(dev->udev->descriptor.idVendor) + == 0xeb1a) { __le16 idProd = dev->udev->descriptor.idProduct; if (le16_to_cpu(idProd) == 0x2710) chip_name = "em2710";