leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

V4L/DVB (5255): Fix cx25840 firmware loading.

Browse Source 
Due to changes in the i2c handling in 2.6.20 this cx25840 bug surfaced,
causing the firmware load to fail for the ivtv driver. The correct
sequence is to first attach the i2c client, then use the client's
device to load the firmware.
Acked-by: Mike Isely <isely@pobox.com>

Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
This commit is contained in:
Hans Verkuil 2007-02-15 03:40:34 -03:00 committed by Mauro Carvalho Chehab
parent 2ff7354fe8
commit d55c7aec66
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/media/video/cx25840/cx25840-core.c
View File

@ -903,13 +903,13 @@ static int cx25840_detect_client(struct i2c_adapter *adapter, int address,
state->vbi_line_offset = 8;
state->id = id;
i2c_attach_client(client);
if (state->is_cx25836)
cx25836_initialize(client);
else
cx25840_initialize(client, 1);
i2c_attach_client(client);
return 0;
}

2
drivers/media/video/cx25840/cx25840-firmware.c
View File

@ -37,7 +37,7 @@
*/
#define FWSEND 48
#define FWDEV(x) &((x)->adapter->dev)
#define FWDEV(x) &((x)->dev)
static char *firmware = FWFILE;