The patch number 9921 was added via Devin Heitmueller <[email protected]>
to http://linuxtv.org/hg/v4l-dvb master development tree.

Kernel patches in this development tree may be modified to be backward
compatible with older kernels. Compatibility modifications will be
removed before inclusion into the mainstream Kernel

If anyone has any objections, please let us know by sending a message to:
        [email protected]

------

From: Devin Heitmueller  <[email protected]>
em28xx: add chip id for em2874


Add the em2870 to the list of known em28xx chip ids.

Priority: normal

Signed-off-by: Devin Heitmueller <[email protected]>


---

 linux/drivers/media/video/em28xx/em28xx-cards.c |    4 ++++
 linux/drivers/media/video/em28xx/em28xx-reg.h   |    1 +
 2 files changed, 5 insertions(+)

diff -r 8760744a13a8 -r 9cd754abbb03 
linux/drivers/media/video/em28xx/em28xx-cards.c
--- a/linux/drivers/media/video/em28xx/em28xx-cards.c   Tue Dec 16 21:09:35 
2008 -0500
+++ b/linux/drivers/media/video/em28xx/em28xx-cards.c   Tue Dec 16 21:15:33 
2008 -0500
@@ -1480,6 +1480,10 @@ void em28xx_pre_card_setup(struct em28xx
                case CHIP_ID_EM2860:
                        em28xx_info("chip ID is em2860\n");
                        break;
+               case CHIP_ID_EM2870:
+                       em28xx_info("chip ID is em2870\n");
+                       dev->wait_after_write = 0;
+                       break;
                case CHIP_ID_EM2874:
                        em28xx_info("chip ID is em2874\n");
                        dev->reg_gpio_num = EM2874_R80_GPIO;
diff -r 8760744a13a8 -r 9cd754abbb03 
linux/drivers/media/video/em28xx/em28xx-reg.h
--- a/linux/drivers/media/video/em28xx/em28xx-reg.h     Tue Dec 16 21:09:35 
2008 -0500
+++ b/linux/drivers/media/video/em28xx/em28xx-reg.h     Tue Dec 16 21:15:33 
2008 -0500
@@ -151,6 +151,7 @@ enum em28xx_chip_id {
        CHIP_ID_EM2840 = 20,
        CHIP_ID_EM2750 = 33,
        CHIP_ID_EM2860 = 34,
+       CHIP_ID_EM2870 = 35,
        CHIP_ID_EM2883 = 36,
        CHIP_ID_EM2874 = 65,
 };


---

Patch is available at: 
http://linuxtv.org/hg/v4l-dvb/rev/9cd754abbb03806151d7a568c6dda4258e4bb208

_______________________________________________
linuxtv-commits mailing list
[email protected]
http://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits

Reply via email to