1 files changed, 8 insertions, 8 deletions

diff --git a/drivers/media/usb/em28xx/em28xx-cards.c b/drivers/media/usb/em28xx/em28xx-cards.c
index a3c305598b4b..54ead1ec71a8 100644
--- 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);