From: Sascha Sommer Date: Sun, 8 Jan 2012 19:32:09 +0000 (-0300) Subject: [media] em28xx: Do not modify EM28XX_R06_I2C_CLK for em2800 X-Git-Tag: v3.12-rc1~3230^2~126 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ca80cf60489508792e97a7703ed35756f4d62943;p=kernel%2Fkernel-generic.git [media] em28xx: Do not modify EM28XX_R06_I2C_CLK for em2800 writing the EM28XX_R06_I2C_CLK register leads to the problem that the i2c bus on the Terratec Cinergy 200 USB is no longer usable when the system is rebooted. The device needs to be unplugged in order to bring it back to life. Attached patch conditionally disables the write in em28xx_pre_card_setup() like it is already done in em28xx_card_setup(). Signed-off-by: Sascha Sommer Signed-off-by: Mauro Carvalho Chehab --- diff --git a/drivers/media/video/em28xx/em28xx-cards.c b/drivers/media/video/em28xx/em28xx-cards.c index 6448011..21cc910 100644 --- a/drivers/media/video/em28xx/em28xx-cards.c +++ b/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 */