diff options
| author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-03-13 20:17:47 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-03-13 20:17:47 -0300 |
| commit | 675d7080a5676f235b39a78a0af9d6a32b589133 (patch) | |
| tree | fff786e9e33cd9c182e22f8bb8c67a92fb3ad63e /linux/drivers/media/video/cx25840/cx25840-core.c | |
| parent | 3e0273a7209d6a20bd422beec8b46dd6b79a00a7 (diff) | |
| parent | eb97af7a1c842f6958f57fe8f9dbd93471d17948 (diff) | |
| download | mediapointer-dvb-s2-675d7080a5676f235b39a78a0af9d6a32b589133.tar.gz mediapointer-dvb-s2-675d7080a5676f235b39a78a0af9d6a32b589133.tar.bz2 | |
merge: http://linuxtv.org/hg/~gliakhovetski/v4l-dvb
From: Mauro Carvalho Chehab <mchehab@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'linux/drivers/media/video/cx25840/cx25840-core.c')
| -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); |