summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHans Verkuil <hverkuil@xs4all.nl>2009-03-13 13:36:00 -0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2009-04-06 21:44:05 -0300
commit00ca732451c8aaec430c84a0c5cd1e1c01227dfa (patch)
tree8d0ef6547ed4e7535ecf5382628d372e9e75c064
parentd73abcff75cd3b1b5c910df454ac332beb29eed1 (diff)
downloadlinux-00ca732451c8aaec430c84a0c5cd1e1c01227dfa.tar.gz
V4L/DVB (10989): cx25840: cx23885 detection was broken
An earlier commit accidentally broke the detection of the cx25837 part of the cx23885. Reinstated the commented out code. Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
-rw-r--r--drivers/media/video/cx25840/cx25840-core.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/video/cx25840/cx25840-core.c b/drivers/media/video/cx25840/cx25840-core.c
index a6d9bdbe7a9d..f8ed3c09b17c 100644
--- a/drivers/media/video/cx25840/cx25840-core.c
+++ b/drivers/media/video/cx25840/cx25840-core.c
@@ -1535,9 +1535,9 @@ static int cx25840_probe(struct i2c_client *client,
}
else if ((device_id & 0xff00) == 0x8400) {
id = V4L2_IDENT_CX25840 + ((device_id >> 4) & 0xf);
- } /* else if (device_id == 0x0000) {
+ } else if (device_id == 0x0000) {
id = V4L2_IDENT_CX25836 + ((device_id >> 4) & 0xf) - 6;
- } */ else if (device_id == 0x1313) {
+ } else if (device_id == 0x1313) {
id = V4L2_IDENT_CX25836 + ((device_id >> 4) & 0xf) - 6;
} else if ((device_id & 0xfff0) == 0x5A30) {
id = V4L2_IDENT_CX25840 + ((device_id >> 4) & 0xf);