[media] em28xx: improve em2710/em2820 distinction

Chip id 18 is used by the em2710 and em2820.
The current code assumes that if the device is a camera, the chip is an em2710
and an em2820 otherwise.
But it turned out that the em2820 is also used in camera devices.
"Silvercrest 1.3 MPix" webcams for example are available with both chips.
Fortunately both variants are using different generic USD IDs which give us a
hint about the used chip.

Signed-off-by: Frank Schäfer <fschaefer.oss@googlemail.com>
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

diff --git a/drivers/media/usb/em28xx/em28xx-cards.c b/drivers/media/usb/em28xx/em28xx-cards.c
index a3c305598b4b487219865281e399adc661ae0a3c..54ead1ec71a8dd0b14715550af94faacec67f99b 100644 (file)
--- a/drivers/media/usb/em28xx/em28xx-cards.c
+++ b/drivers/media/usb/em28xx/em28xx-cards.c
@@ -2909,6 +2909,14 @@ 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) {
+                               __le16 idProd = dev->udev->descriptor.idProduct;
+                               if (le16_to_cpu(idProd) == 0x2710)
+                                       chip_name = "em2710";
+                               else if (le16_to_cpu(idProd) == 0x2820)
+                                       chip_name = "em2820";
+                       }
+                       /* NOTE: the em2820 is used in webcams, too ! */
                        break;
                case CHIP_ID_EM2840:
                        chip_name = "em2840";
@@ -2974,14 +2982,6 @@ static int em28xx_init_dev(struct em28xx *dev, struct usb_device *udev,
 
        em28xx_pre_card_setup(dev);
 
-       if (dev->chip_id == CHIP_ID_EM2820) {
-               if (dev->board.is_webcam)
-                       chip_name = "em2710";
-               else
-                       chip_name = "em2820";
-               snprintf(dev->name, sizeof(dev->name), "%s #%d", chip_name, dev->devno);
-       }
-
        if (!dev->board.is_em2800) {
                /* Resets I2C speed */
                retval = em28xx_write_reg(dev, EM28XX_R06_I2C_CLK, dev->board.i2c_speed);