From 2cacc65f0f6eb6bcee6052164b3d0be46006053e Mon Sep 17 00:00:00 2001 From: Tyler Trafford Date: Tue, 20 Dec 2005 15:45:01 +0000 Subject: make cx25840 recover from some firmware load failures From: Tyler Trafford * linux/drivers/media/video/cx25840/cx25840-firmware.c: (fw_write): - In the rare event that a 333MHz i2c firmware load fails after writing some data, this fix makes the driver reset the DL_ADDR registers to the proper values before continuing on with 100MHz transfers. Signed-off-by: Tyler Trafford --- linux/drivers/media/video/cx25840/cx25840-firmware.c | 13 +++++++++++-- v4l/ChangeLog | 10 ++++++++++ 2 files changed, 21 insertions(+), 2 deletions(-) diff --git a/linux/drivers/media/video/cx25840/cx25840-firmware.c b/linux/drivers/media/video/cx25840/cx25840-firmware.c index 9bdb2d1b3..b31d3d1ce 100644 --- a/linux/drivers/media/video/cx25840/cx25840-firmware.c +++ b/linux/drivers/media/video/cx25840/cx25840-firmware.c @@ -16,7 +16,6 @@ */ #include "compat.h" - #include #include #include @@ -104,13 +103,23 @@ static inline int check_fw_load(struct i2c_client *client, int size) static inline int fw_write(struct i2c_client *client, u8 * data, int size) { - if (i2c_master_send(client, data, size) < size) { + int sent; + + if ((sent = i2c_master_send(client, data, size)) < size) { if (fastfw) { cx25840_err("333MHz i2c firmware load failed\n"); fastfw = 0; set_i2c_delay(client, 10); + if (sent > 2) { + u16 dl_addr = cx25840_read(client, 0x801) << 8; + dl_addr |= cx25840_read(client, 0x800); + dl_addr -= sent - 2; + cx25840_write(client, 0x801, dl_addr >> 8); + cx25840_write(client, 0x800, dl_addr & 0xff); + } + if (i2c_master_send(client, data, size) < size) { cx25840_err ("100MHz i2c firmware load failed\n"); diff --git a/v4l/ChangeLog b/v4l/ChangeLog index 22dbd51cb..85d0f789a 100644 --- a/v4l/ChangeLog +++ b/v4l/ChangeLog @@ -1,3 +1,13 @@ +2005-12-20 10:43 trafford + + * linux/drivers/media/video/cx25840/cx25840-firmware.c: (fw_write): + - In the rare event that a 333MHz i2c firmware load fails after + writing some data, this fix makes the driver reset the DL_ADDR + registers to the proper values before continuing on with 100MHz + transfers. + + Signed-off-by: Tyler Trafford + 2005-12-20 07:50 mkrufky * linux/include/media/tuner.h: -- cgit v1.2.3