aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Documentation/video4linux/CARDLIST.em28xx2
-rw-r--r--drivers/media/video/em28xx/em28xx-cards.c9
2 files changed, 6 insertions, 5 deletions
diff --git a/Documentation/video4linux/CARDLIST.em28xx b/Documentation/video4linux/CARDLIST.em28xx
index 014d255231fc..68c236c01846 100644
--- a/Documentation/video4linux/CARDLIST.em28xx
+++ b/Documentation/video4linux/CARDLIST.em28xx
@@ -20,7 +20,7 @@
20 19 -> EM2860/SAA711X Reference Design (em2860) 20 19 -> EM2860/SAA711X Reference Design (em2860)
21 20 -> AMD ATI TV Wonder HD 600 (em2880) [0438:b002] 21 20 -> AMD ATI TV Wonder HD 600 (em2880) [0438:b002]
22 21 -> eMPIA Technology, Inc. GrabBeeX+ Video Encoder (em2800) [eb1a:2801] 22 21 -> eMPIA Technology, Inc. GrabBeeX+ Video Encoder (em2800) [eb1a:2801]
23 22 -> Unknown EM2750/EM2751 webcam grabber (em2750) [eb1a:2750,eb1a:2751] 23 22 -> EM2710/EM2750/EM2751 webcam grabber (em2750) [eb1a:2750,eb1a:2751]
24 23 -> Huaqi DLCW-130 (em2750) 24 23 -> Huaqi DLCW-130 (em2750)
25 24 -> D-Link DUB-T210 TV Tuner (em2820/em2840) [2001:f112] 25 24 -> D-Link DUB-T210 TV Tuner (em2820/em2840) [2001:f112]
26 25 -> Gadmei UTV310 (em2820/em2840) 26 25 -> Gadmei UTV310 (em2820/em2840)
diff --git a/drivers/media/video/em28xx/em28xx-cards.c b/drivers/media/video/em28xx/em28xx-cards.c
index 9e71f034665d..e64e1242a1ba 100644
--- a/drivers/media/video/em28xx/em28xx-cards.c
+++ b/drivers/media/video/em28xx/em28xx-cards.c
@@ -205,7 +205,7 @@ static struct em28xx_reg_seq silvercrest_reg_seq[] = {
205 */ 205 */
206struct em28xx_board em28xx_boards[] = { 206struct em28xx_board em28xx_boards[] = {
207 [EM2750_BOARD_UNKNOWN] = { 207 [EM2750_BOARD_UNKNOWN] = {
208 .name = "Unknown EM2750/EM2751 webcam grabber", 208 .name = "EM2710/EM2750/EM2751 webcam grabber",
209 .xclk = EM28XX_XCLK_FREQUENCY_48MHZ, 209 .xclk = EM28XX_XCLK_FREQUENCY_48MHZ,
210 .tuner_type = TUNER_ABSENT, 210 .tuner_type = TUNER_ABSENT,
211 .is_webcam = 1, 211 .is_webcam = 1,
@@ -1720,7 +1720,8 @@ static int em28xx_hint_sensor(struct em28xx *dev)
1720 __be16 version_be; 1720 __be16 version_be;
1721 u16 version; 1721 u16 version;
1722 1722
1723 if (dev->model != EM2820_BOARD_UNKNOWN) 1723 if (dev->model != EM2820_BOARD_UNKNOWN &&
1724 dev->model != EM2750_BOARD_UNKNOWN)
1724 return 0; 1725 return 0;
1725 1726
1726 dev->i2c_client.addr = 0xba >> 1; 1727 dev->i2c_client.addr = 0xba >> 1;
@@ -1738,11 +1739,11 @@ static int em28xx_hint_sensor(struct em28xx *dev)
1738 sensor_name = "mt9v011"; 1739 sensor_name = "mt9v011";
1739 break; 1740 break;
1740 default: 1741 default:
1741 printk("Unknown Sensor 0x%04x\n", be16_to_cpu(version)); 1742 printk("Unknown Micron Sensor 0x%04x\n", be16_to_cpu(version));
1742 return -EINVAL; 1743 return -EINVAL;
1743 } 1744 }
1744 1745
1745 em28xx_errdev("Sensor is %s, assuming that webcam is %s\n", 1746 em28xx_errdev("Sensor is %s, using model %s entry.\n",
1746 sensor_name, em28xx_boards[dev->model].name); 1747 sensor_name, em28xx_boards[dev->model].name);
1747 1748
1748 return 0; 1749 return 0;