Skip to content

Commit

Permalink
V4L/DVB (10989): cx25840: cx23885 detection was broken
Browse files Browse the repository at this point in the history 
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>
  • Loading branch information
Hans Verkuil authored and Mauro Carvalho Chehab committed Apr 7, 2009
1 parent d73abcf commit 00ca732
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions drivers/media/video/cx25840/cx25840-core.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down

0 comments on commit 00ca732

Please sign in to comment.