---

yaml --- r: 124181 b: refs/heads/master c: 600bd7f h: refs/heads/master i: 124179: dfe93c0 v: v3
git-mirror · Dec 29, 2008 · 8d5a606 · 8d5a606
1 parent 8f63a29
commit 8d5a606
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 1 deletion.
diff --git 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
@@ -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
@@ -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;