---

yaml --- r: 153929 b: refs/heads/master c: cdf7bfa h: refs/heads/master i: 153927: db1bb6a v: v3
git-mirror · Jun 23, 2009 · 783fcdd · 783fcdd
1 parent f7d7c69
commit 783fcdd
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f867c3f4eab1d5006df4f3734fab1134feffbeba
+refs/heads/master: cdf7bfa8926fb26d5900103ae09eb5f3eddb95cc
diff --git a/trunk/drivers/media/video/em28xx/em28xx-cards.c b/trunk/drivers/media/video/em28xx/em28xx-cards.c
@@ -2101,6 +2101,12 @@ void em28xx_card_setup(struct em28xx *dev)
 	case EM2880_BOARD_MSI_DIGIVOX_AD:
 		if (!em28xx_hint_board(dev))
 			em28xx_set_model(dev);
+
+		/* In cases where we had to use a board hint, the call to
+		   em28xx_set_mode() in em28xx_pre_card_setup() was a no-op,
+		   so make the call now so the analog GPIOs are set properly
+		   before probing the i2c bus. */
+		em28xx_set_mode(dev, EM28XX_ANALOG_MODE);
 		break;
 	}