summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@redhat.com>2008-11-12 05:04:48 +0000
committerMauro Carvalho Chehab <mchehab@redhat.com>2008-11-12 05:04:48 +0000
commit01ea3eb2c9dbd7537a6cd1c915bf7a098d80715d (patch)
tree1f79c93c304231d7738fe0ed2e1084e7216c409c
parent1f0f6394be119a5916c8b5c6caa4910336544945 (diff)
downloadmediapointer-dvb-s2-01ea3eb2c9dbd7537a6cd1c915bf7a098d80715d.tar.gz
mediapointer-dvb-s2-01ea3eb2c9dbd7537a6cd1c915bf7a098d80715d.tar.bz2
Add chip id for em2874 to list of known chips
From: Devin Heitmueller <devin.heitmueller@gmail.com> Add em2874 chip id Add chip id for em2874 to list of known chips Signed-off-by: Devin Heitmueller <devin.heitmueller@gmail.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
-rw-r--r--linux/drivers/media/video/em28xx/em28xx-cards.c4
-rw-r--r--linux/drivers/media/video/em28xx/em28xx-reg.h1
2 files changed, 5 insertions, 0 deletions
diff --git a/linux/drivers/media/video/em28xx/em28xx-cards.c b/linux/drivers/media/video/em28xx/em28xx-cards.c
index 4f078da31..072561e47 100644
--- a/linux/drivers/media/video/em28xx/em28xx-cards.c
+++ b/linux/drivers/media/video/em28xx/em28xx-cards.c
@@ -1328,6 +1328,10 @@ void em28xx_pre_card_setup(struct em28xx *dev)
case CHIP_ID_EM2860:
em28xx_info("chip ID is em2860\n");
break;
+ case CHIP_ID_EM2874:
+ em28xx_info("chip ID is em2874\n");
+ dev->wait_after_write = 0;
+ break;
case CHIP_ID_EM2883:
em28xx_info("chip ID is em2882/em2883\n");
dev->wait_after_write = 0;
diff --git a/linux/drivers/media/video/em28xx/em28xx-reg.h b/linux/drivers/media/video/em28xx/em28xx-reg.h
index fac1ab23f..0892df17f 100644
--- a/linux/drivers/media/video/em28xx/em28xx-reg.h
+++ b/linux/drivers/media/video/em28xx/em28xx-reg.h
@@ -86,4 +86,5 @@
enum em28xx_chip_id {
CHIP_ID_EM2860 = 34,
CHIP_ID_EM2883 = 36,
+ CHIP_ID_EM2874 = 65,
};