From c693ccae3d2e417321388998a4388333de29bebd Mon Sep 17 00:00:00 2001 From: Mauro Carvalho Chehab Date: Thu, 12 Nov 2009 11:21:05 -0300 Subject: [PATCH] --- yaml --- r: 174063 b: refs/heads/master c: f57b17c3956f2e1e70f63dd2ed8088b582f3915e h: refs/heads/master i: 174061: 458f286c8c38352493c4bdda35ce19e11e5344b8 174059: 20d75d2c539c67b4e762c07b6feed742ad0b4496 174055: b65098dcf75227b3c2a5111ae4a6bcefda4e67b0 174047: da4c662f1f2321dd096ecacb50b9564219a93326 v: v3 --- [refs] | 2 +- trunk/drivers/media/video/em28xx/em28xx-cards.c | 3 +++ trunk/drivers/media/video/em28xx/em28xx-reg.h | 1 + 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index c6d25c95e8ab..58f65046f891 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: fc099f0e0e52a349a3fe92bfb8d3fb6ec5378174 +refs/heads/master: f57b17c3956f2e1e70f63dd2ed8088b582f3915e diff --git a/trunk/drivers/media/video/em28xx/em28xx-cards.c b/trunk/drivers/media/video/em28xx/em28xx-cards.c index 1e1937070738..00bceb865a7c 100644 --- a/trunk/drivers/media/video/em28xx/em28xx-cards.c +++ b/trunk/drivers/media/video/em28xx/em28xx-cards.c @@ -2532,6 +2532,9 @@ static int em28xx_init_dev(struct em28xx **devhandle, struct usb_device *udev, dev->chip_id = retval; switch (dev->chip_id) { + case CHIP_ID_EM2800: + em28xx_info("chip ID is em2800\n"); + break; case CHIP_ID_EM2710: em28xx_info("chip ID is em2710\n"); break; diff --git a/trunk/drivers/media/video/em28xx/em28xx-reg.h b/trunk/drivers/media/video/em28xx/em28xx-reg.h index ed12e7ffcbd0..058ac87639ce 100644 --- a/trunk/drivers/media/video/em28xx/em28xx-reg.h +++ b/trunk/drivers/media/video/em28xx/em28xx-reg.h @@ -192,6 +192,7 @@ /* FIXME: Need to be populated with the other chip ID's */ enum em28xx_chip_id { + CHIP_ID_EM2800 = 7, CHIP_ID_EM2710 = 17, CHIP_ID_EM2820 = 18, /* Also used by some em2710 */ CHIP_ID_EM2840 = 20,