summaryrefslogtreecommitdiff
path: root/linux/drivers/media/video/cx25840/cx25840-core.c
diff options
context:
space:
mode:
authorHans Verkuil <hverkuil@xs4all.nl>2007-02-03 00:49:54 +0100
committerHans Verkuil <hverkuil@xs4all.nl>2007-02-03 00:49:54 +0100
commitb5f5fe52acd6950d39ed7bade847af37031ae213 (patch)
treeb12708c1464d58d6dc8beafe95972cf4e99ef079 /linux/drivers/media/video/cx25840/cx25840-core.c
parent59441327a8264f058006020884b9534fb072a138 (diff)
downloadmediapointer-dvb-s2-b5f5fe52acd6950d39ed7bade847af37031ae213.tar.gz
mediapointer-dvb-s2-b5f5fe52acd6950d39ed7bade847af37031ae213.tar.bz2
Fix cx2584x revision reporting.
From: Hans Verkuil <hverkuil@xs4all.nl> Revisions >= 23 were always reported as revision 23. Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Diffstat (limited to 'linux/drivers/media/video/cx25840/cx25840-core.c')
-rw-r--r--linux/drivers/media/video/cx25840/cx25840-core.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/linux/drivers/media/video/cx25840/cx25840-core.c b/linux/drivers/media/video/cx25840/cx25840-core.c
index b06553a1f..a1a4907af 100644
--- a/linux/drivers/media/video/cx25840/cx25840-core.c
+++ b/linux/drivers/media/video/cx25840/cx25840-core.c
@@ -908,9 +908,11 @@ static int cx25840_detect_client(struct i2c_adapter *adapter, int address,
return 0;
}
+ /* Note: revision '(device_id & 0x0f) == 2' was never built. The
+ marking skips from 0x1 == 22 to 0x3 == 23. */
v4l_info(client, "cx25%3x-2%x found @ 0x%x (%s)\n",
(device_id & 0xfff0) >> 4,
- (device_id & 0x0f) < 3 ? (device_id & 0x0f) + 1 : 3,
+ (device_id & 0x0f) < 3 ? (device_id & 0x0f) + 1 : (device_id & 0x0f),
address << 1, adapter->name);
i2c_set_clientdata(client, state);