diff options
| author | Hans Verkuil <hverkuil@xs4all.nl> | 2009-03-13 17:36:00 +0100 |
|---|---|---|
| committer | Hans Verkuil <hverkuil@xs4all.nl> | 2009-03-13 17:36:00 +0100 |
| commit | c3ce9d2f22c72aa484146a24d87be98d1a29ab9f (patch) | |
| tree | a1ab9b66613b9221f537fb054f0f2d963b3527ad /linux | |
| parent | e0880a34f81b5282fa1be0f8872664992db9cdfd (diff) | |
| download | mediapointer-dvb-s2-c3ce9d2f22c72aa484146a24d87be98d1a29ab9f.tar.gz mediapointer-dvb-s2-c3ce9d2f22c72aa484146a24d87be98d1a29ab9f.tar.bz2 | |
cx25840: cx23885 detection was broken
From: Hans Verkuil <hverkuil@xs4all.nl>
An earlier commit accidentally broke the detection of the cx25837 part of
the cx23885. Reinstated the commented out code.
Priority: normal
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Diffstat (limited to 'linux')
| -rw-r--r-- | linux/drivers/media/video/cx25840/cx25840-core.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/linux/drivers/media/video/cx25840/cx25840-core.c b/linux/drivers/media/video/cx25840/cx25840-core.c index b10f2bb8b..5387a846f 100644 --- a/linux/drivers/media/video/cx25840/cx25840-core.c +++ b/linux/drivers/media/video/cx25840/cx25840-core.c @@ -1594,9 +1594,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); |