From 8d5a6065c61ecf4a41b7f4f63aa02b48eb5a9f67 Mon Sep 17 00:00:00 2001 From: Devin Heitmueller Date: Wed, 12 Nov 2008 02:05:02 -0300 Subject: [PATCH] --- yaml --- r: 124181 b: refs/heads/master c: 600bd7f0edee0f9687c3c77e6fe63c74452acbfa h: refs/heads/master i: 124179: dfe93c044a7a1d4eb129c2863f2963b444a2124c v: v3 --- [refs] | 2 +- trunk/drivers/media/video/em28xx/em28xx-cards.c | 1 + trunk/drivers/media/video/em28xx/em28xx.h | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 67c679dcc509..0fd2155af460 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1ed1dd54b0456a880ab4090275a47eb5a7a245d1 +refs/heads/master: 600bd7f0edee0f9687c3c77e6fe63c74452acbfa diff --git a/trunk/drivers/media/video/em28xx/em28xx-cards.c b/trunk/drivers/media/video/em28xx/em28xx-cards.c index d93e1eb04331..90389270389b 100644 --- a/trunk/drivers/media/video/em28xx/em28xx-cards.c +++ b/trunk/drivers/media/video/em28xx/em28xx-cards.c @@ -1319,6 +1319,7 @@ void em28xx_pre_card_setup(struct em28xx *dev) dev->wait_after_write = 5; rc = em28xx_read_reg(dev, EM28XX_R0A_CHIPID); if (rc > 0) { + dev->chip_id = rc; switch (rc) { case CHIP_ID_EM2860: em28xx_info("chip ID is em2860\n"); diff --git a/trunk/drivers/media/video/em28xx/em28xx.h b/trunk/drivers/media/video/em28xx/em28xx.h index d1679a6eb33f..fc2db0d60fca 100644 --- a/trunk/drivers/media/video/em28xx/em28xx.h +++ b/trunk/drivers/media/video/em28xx/em28xx.h @@ -370,6 +370,7 @@ struct em28xx { char name[30]; /* name (including minor) of the device */ int model; /* index in the device_data struct */ int devno; /* marks the number of this device */ + enum em28xx_chip_id chip_id; unsigned int is_em2800:1; unsigned int has_msp34xx:1; unsigned int has_tda9887:1;