diff options
author | Hans Verkuil <hverkuil@xs4all.nl> | 2009-03-13 12:36:00 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-04-06 20:44:05 -0400 |
commit | 00ca732451c8aaec430c84a0c5cd1e1c01227dfa (patch) | |
tree | 8d0ef6547ed4e7535ecf5382628d372e9e75c064 /drivers/media/video/cx25840 | |
parent | d73abcff75cd3b1b5c910df454ac332beb29eed1 (diff) |
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>
Diffstat (limited to 'drivers/media/video/cx25840')
-rw-r--r-- | drivers/media/video/cx25840/cx25840-core.c | 4 |
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, | |||
1535 | } | 1535 | } |
1536 | else if ((device_id & 0xff00) == 0x8400) { | 1536 | else if ((device_id & 0xff00) == 0x8400) { |
1537 | id = V4L2_IDENT_CX25840 + ((device_id >> 4) & 0xf); | 1537 | id = V4L2_IDENT_CX25840 + ((device_id >> 4) & 0xf); |
1538 | } /* else if (device_id == 0x0000) { | 1538 | } else if (device_id == 0x0000) { |
1539 | id = V4L2_IDENT_CX25836 + ((device_id >> 4) & 0xf) - 6; | 1539 | id = V4L2_IDENT_CX25836 + ((device_id >> 4) & 0xf) - 6; |
1540 | } */ else if (device_id == 0x1313) { | 1540 | } else if (device_id == 0x1313) { |
1541 | id = V4L2_IDENT_CX25836 + ((device_id >> 4) & 0xf) - 6; | 1541 | id = V4L2_IDENT_CX25836 + ((device_id >> 4) & 0xf) - 6; |
1542 | } else if ((device_id & 0xfff0) == 0x5A30) { | 1542 | } else if ((device_id & 0xfff0) == 0x5A30) { |
1543 | id = V4L2_IDENT_CX25840 + ((device_id >> 4) & 0xf); | 1543 | id = V4L2_IDENT_CX25840 + ((device_id >> 4) & 0xf); |