V4L/DVB (10989): cx25840: cx23885 detection was broken
Hans Verkuil [Fri, 13 Mar 2009 16:36:00 +0000 (13:36 -0300)]
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>

drivers/media/video/cx25840/cx25840-core.c

index a6d9bdb..f8ed3c0 100644 (file)
@@ -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);