---

yaml --- r: 285779 b: refs/heads/master c: ca80cf6 h: refs/heads/master i: 285777: 43c0732 285775: 3050877 v: v3
git-mirror · Jan 11, 2012 · 50c5569 · 50c5569
1 parent 9f8ffeb
commit 50c5569
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0903bb540e5bb99a9e58d583a596a30620f65702
+refs/heads/master: ca80cf60489508792e97a7703ed35756f4d62943
diff --git a/trunk/drivers/media/video/em28xx/em28xx-cards.c b/trunk/drivers/media/video/em28xx/em28xx-cards.c
@@ -2287,7 +2287,8 @@ void em28xx_pre_card_setup(struct em28xx *dev)
 	/* Set the initial XCLK and I2C clock values based on the board
 	   definition */
 	em28xx_write_reg(dev, EM28XX_R0F_XCLK, dev->board.xclk & 0x7f);
-	em28xx_write_reg(dev, EM28XX_R06_I2C_CLK, dev->board.i2c_speed);
+	if (!dev->board.is_em2800)
+		em28xx_write_reg(dev, EM28XX_R06_I2C_CLK, dev->board.i2c_speed);
 	msleep(50);
 
 	/* request some modules */