diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-02-16 07:35:15 -0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-02-16 07:35:15 -0200 |
| commit | 14f8694a006fc440ea2f5f18aaefd3ff7d98e313 (patch) | |
| tree | 5e2f9db2f9c91e450dd7bf36f5c206f3978c69a7 /linux/drivers/media | |
| parent | 5a151f48b98aa886c3789ed20a0dd575ce1c4279 (diff) | |
| parent | 576a4462214a9b98c55dd518697ebd0c07f6ea37 (diff) | |
| download | mediapointer-dvb-s2-14f8694a006fc440ea2f5f18aaefd3ff7d98e313.tar.gz mediapointer-dvb-s2-14f8694a006fc440ea2f5f18aaefd3ff7d98e313.tar.bz2 | |
merge: http://linuxtv.org/hg/~hverkuil/v4l-dvb2
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/drivers/media')
| -rw-r--r-- | linux/drivers/media/video/cx25840/cx25840-core.c | 4 | ||||
| -rw-r--r-- | linux/drivers/media/video/cx25840/cx25840-firmware.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/linux/drivers/media/video/cx25840/cx25840-core.c b/linux/drivers/media/video/cx25840/cx25840-core.c index a1a4907af..fc1e7da7c 100644 --- a/linux/drivers/media/video/cx25840/cx25840-core.c +++ b/linux/drivers/media/video/cx25840/cx25840-core.c @@ -924,13 +924,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); - #if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0) MOD_INC_USE_COUNT; #endif diff --git a/linux/drivers/media/video/cx25840/cx25840-firmware.c b/linux/drivers/media/video/cx25840/cx25840-firmware.c index e14e0bc1f..1b730b155 100644 --- a/linux/drivers/media/video/cx25840/cx25840-firmware.c +++ b/linux/drivers/media/video/cx25840/cx25840-firmware.c @@ -39,7 +39,7 @@ #define FWSEND 48 #if LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0) -#define FWDEV(x) &((x)->adapter->dev) +#define FWDEV(x) &((x)->dev) #else #define FWDEV(x) (x)->name #endif |