From 50c556957ac8cf058b263ff5bf3457e73128286e Mon Sep 17 00:00:00 2001 From: Sascha Sommer Date: Sun, 8 Jan 2012 16:32:09 -0300 Subject: [PATCH] --- yaml --- r: 285779 b: refs/heads/master c: ca80cf60489508792e97a7703ed35756f4d62943 h: refs/heads/master i: 285777: 43c0732a8ab6a4ae37a443a15a2287755386d326 285775: 305087797ae9221d8550be7f67c7f3d779af159b v: v3 --- [refs] | 2 +- trunk/drivers/media/video/em28xx/em28xx-cards.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 811314f831b2..2d6b871ff6e2 100644 --- 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 index 6448011e3a1b..21cc910ecd83 100644 --- 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 */