aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGregory Lardiere <spmf2004-m560x@yahoo.fr>2009-02-22 15:54:11 -0500
committerMauro Carvalho Chehab <mchehab@redhat.com>2009-03-05 18:33:37 -0500
commitd2c452306ab402d7a3572bc3bf8e575796529bf8 (patch)
treeed7ff109f5fe45b1570483570ecc71aa478e10a9
parent559595a985e106d2fa9f0c79b7f5805453fed593 (diff)
V4L/DVB (10789): m5602-s5k4aa: Split up the initial sensor probe in chunks.
The previous probe rotine tried to read 6 bytes in one chunk which currently isn't allowed. This is the rev. 10346 243399e67c41 readded with a high priority. Signed-off-by: Gregory Lardiere <spmf2004-m560x@yahoo.fr> Signed-off-by: Erik Andrén <erik.andren@gmail.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
-rw-r--r--drivers/media/video/gspca/m5602/m5602_s5k4aa.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/media/video/gspca/m5602/m5602_s5k4aa.c b/drivers/media/video/gspca/m5602/m5602_s5k4aa.c
index e564a61a72d7..48892b5715d5 100644
--- a/drivers/media/video/gspca/m5602/m5602_s5k4aa.c
+++ b/drivers/media/video/gspca/m5602/m5602_s5k4aa.c
@@ -102,7 +102,11 @@ int s5k4aa_probe(struct sd *sd)
102 } 102 }
103 103
104 /* Test some registers, but we don't know their exact meaning yet */ 104 /* Test some registers, but we don't know their exact meaning yet */
105 if (m5602_read_sensor(sd, 0x00, prod_id, sizeof(prod_id))) 105 if (m5602_read_sensor(sd, 0x00, prod_id, 2))
106 return -ENODEV;
107 if (m5602_read_sensor(sd, 0x02, prod_id+2, 2))
108 return -ENODEV;
109 if (m5602_read_sensor(sd, 0x04, prod_id+4, 2))
106 return -ENODEV; 110 return -ENODEV;
107 111
108 if (memcmp(prod_id, expected_prod_id, sizeof(prod_id))) 112 if (memcmp(prod_id, expected_prod_id, sizeof(prod_id)))