Commit 00ca7324 authored by Hans Verkuil's avatar Hans Verkuil Committed by Mauro Carvalho Chehab

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: default avatarHans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent d73abcff
...@@ -1535,9 +1535,9 @@ static int cx25840_probe(struct i2c_client *client, ...@@ -1535,9 +1535,9 @@ static int cx25840_probe(struct i2c_client *client,
} }
else if ((device_id & 0xff00) == 0x8400) { else if ((device_id & 0xff00) == 0x8400) {
id = V4L2_IDENT_CX25840 + ((device_id >> 4) & 0xf); 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; 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; id = V4L2_IDENT_CX25836 + ((device_id >> 4) & 0xf) - 6;
} else if ((device_id & 0xfff0) == 0x5A30) { } else if ((device_id & 0xfff0) == 0x5A30) {
id = V4L2_IDENT_CX25840 + ((device_id >> 4) & 0xf); id = V4L2_IDENT_CX25840 + ((device_id >> 4) & 0xf);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment