summaryrefslogtreecommitdiffstats
path: root/drivers/media
diff options
context:
space:
mode:
authorHans de Goede <hdgoede@redhat.com>2009-08-14 11:56:32 +0200
committerMauro Carvalho Chehab <mchehab@redhat.com>2009-09-12 17:19:54 +0200
commit58d0b2f66e2495429bc7c4e7c8b0f02fe4a7c260 (patch)
treebbfb6343a19544838f63397a312bcc62ce9595f5 /drivers/media
parentV4L/DVB (12618): gspca: mr97310a add support for CIF and more VGA camera's (diff)
downloadlinux-58d0b2f66e2495429bc7c4e7c8b0f02fe4a7c260.tar.xz
linux-58d0b2f66e2495429bc7c4e7c8b0f02fe4a7c260.zip
V4L/DVB (12619): gspca: mr97310a fix detection of sensortype for vivicam with id byte of 0x53
gspca: mr97310a fix detection of sensortype for vivicam with id byte of 0x53 Signed-off-by: Hans de Goede <hdegoede@redhat.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media')
-rw-r--r--drivers/media/video/gspca/mr97310a.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/media/video/gspca/mr97310a.c b/drivers/media/video/gspca/mr97310a.c
index 3a3edf82a361..db2f84e635c5 100644
--- a/drivers/media/video/gspca/mr97310a.c
+++ b/drivers/media/video/gspca/mr97310a.c
@@ -447,7 +447,8 @@ static int start_cif_cam(struct gspca_dev *gspca_dev)
* Elta-Media 8212dc 0x23 T. Kaiser 1
* Philips dig. keych. 0x37 T. Kilgore 1
*/
- if ((data[0] & 0x78) == 8 || (data[0] & 0x2) == 0x2)
+ if ((data[0] & 0x78) == 8 ||
+ ((data[0] & 0x2) == 0x2 && data[0] != 0x53))
sd->sensor_type = 1;
PDEBUG(D_ERR, "Sensor type is %01x", sd->sensor_type);