From 0eedc67737edf3cac5595c77720d35c279f92d7c Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Fri, 14 Aug 2009 06:56:32 -0300 Subject: [PATCH] --- yaml --- r: 161593 b: refs/heads/master c: 58d0b2f66e2495429bc7c4e7c8b0f02fe4a7c260 h: refs/heads/master i: 161591: 38919a2f120b66cc765d697ef67619718f626d87 v: v3 --- [refs] | 2 +- trunk/drivers/media/video/gspca/mr97310a.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 35a274e2ee64..d63b69cdae73 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 89f0863c4225aaed2763f526815c54a9e1b0f788 +refs/heads/master: 58d0b2f66e2495429bc7c4e7c8b0f02fe4a7c260 diff --git a/trunk/drivers/media/video/gspca/mr97310a.c b/trunk/drivers/media/video/gspca/mr97310a.c index 3a3edf82a361..db2f84e635c5 100644 --- a/trunk/drivers/media/video/gspca/mr97310a.c +++ b/trunk/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);