summaryrefslogtreecommitdiff
path: root/linux/drivers/media/video/cx25840
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@redhat.com>2009-01-27 22:30:35 -0200
committerMauro Carvalho Chehab <mchehab@redhat.com>2009-01-27 22:30:35 -0200
commit6010bb682077907e849ddc89db2bd5e265c55a81 (patch)
treef227ffcf94400734bd992e48f909e89059f41e55 /linux/drivers/media/video/cx25840
parent77e44ee9d10a0f160fe5a89d9d2a727e7a7d26c9 (diff)
parent662705dd5c574972df7a0698fe912f845ac54475 (diff)
downloadmediapointer-dvb-s2-6010bb682077907e849ddc89db2bd5e265c55a81.tar.gz
mediapointer-dvb-s2-6010bb682077907e849ddc89db2bd5e265c55a81.tar.bz2
merge: http://www.linuxtv.org/hg/~hverkuil/v4l-dvb-saa7146
From: Mauro Carvalho Chehab <mchehab@redhat.com> Priority: normal Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'linux/drivers/media/video/cx25840')
-rw-r--r--linux/drivers/media/video/cx25840/cx25840-core.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/linux/drivers/media/video/cx25840/cx25840-core.c b/linux/drivers/media/video/cx25840/cx25840-core.c
index 6d324002a..57e80717f 100644
--- a/linux/drivers/media/video/cx25840/cx25840-core.c
+++ b/linux/drivers/media/video/cx25840/cx25840-core.c
@@ -1412,7 +1412,7 @@ static int cx25840_log_status(struct v4l2_subdev *sd)
static int cx25840_command(struct i2c_client *client, unsigned cmd, void *arg)
{
/* ignore this command */
- if (cmd == TUNER_SET_TYPE_ADDR)
+ if (cmd == TUNER_SET_TYPE_ADDR || cmd == TUNER_SET_CONFIG)
return 0;
/* Old-style drivers rely on initialization on first use, so