From d0c48e4a40df1e21ea322c96d72ffdbe9df9dee0 Mon Sep 17 00:00:00 2001 From: Hans Verkuil Date: Tue, 27 Jan 2009 06:20:34 -0300 Subject: [PATCH] --- yaml --- r: 130769 b: refs/heads/master c: 6d9f13c47a009ccbaf40c2e388ab349690dd8000 h: refs/heads/master i: 130767: 6e9ff60d134b3a9f40aeb7929e5068745cad2305 v: v3 --- [refs] | 2 +- trunk/drivers/media/video/cx25840/cx25840-core.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index eee2d3c62a04..ed62b728142b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d1a470fbd987b28e64287718917faf8caf67a055 +refs/heads/master: 6d9f13c47a009ccbaf40c2e388ab349690dd8000 diff --git a/trunk/drivers/media/video/cx25840/cx25840-core.c b/trunk/drivers/media/video/cx25840/cx25840-core.c index b3b5b17dc8e7..25eb3bec9e5d 100644 --- a/trunk/drivers/media/video/cx25840/cx25840-core.c +++ b/trunk/drivers/media/video/cx25840/cx25840-core.c @@ -1383,7 +1383,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