diff options
author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-03-03 21:32:23 -0300 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-03-03 21:32:23 -0300 |
commit | ce6025ded70648148a8c6c4f440a55e940df1e9e (patch) | |
tree | c4e4476d973043f9090ed1142fc46dd7be4a36c8 /linux/drivers/media/video/gspca/m5602/m5602_s5k4aa.c | |
parent | 7968ebf4e1725375c495aa4bd895a19e88fb8f2c (diff) | |
parent | 3b38addc33a36ea34a73f3f910df0901feb4ff1a (diff) | |
download | mediapointer-dvb-s2-ce6025ded70648148a8c6c4f440a55e940df1e9e.tar.gz mediapointer-dvb-s2-ce6025ded70648148a8c6c4f440a55e940df1e9e.tar.bz2 |
merge: http://linuxtv.org/hg/~eandren/v4l-dvb
From: Mauro Carvalho Chehab <mchehab@redhat.com>
Priority: normal
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'linux/drivers/media/video/gspca/m5602/m5602_s5k4aa.c')
-rw-r--r-- | linux/drivers/media/video/gspca/m5602/m5602_s5k4aa.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/linux/drivers/media/video/gspca/m5602/m5602_s5k4aa.c b/linux/drivers/media/video/gspca/m5602/m5602_s5k4aa.c index 2bd7d4d99..7e79f7eca 100644 --- a/linux/drivers/media/video/gspca/m5602/m5602_s5k4aa.c +++ b/linux/drivers/media/video/gspca/m5602/m5602_s5k4aa.c @@ -104,7 +104,11 @@ int s5k4aa_probe(struct sd *sd) } /* Test some registers, but we don't know their exact meaning yet */ - if (m5602_read_sensor(sd, 0x00, prod_id, sizeof(prod_id))) + if (m5602_read_sensor(sd, 0x00, prod_id, 2)) + return -ENODEV; + if (m5602_read_sensor(sd, 0x02, prod_id+2, 2)) + return -ENODEV; + if (m5602_read_sensor(sd, 0x04, prod_id+4, 2)) return -ENODEV; if (memcmp(prod_id, expected_prod_id, sizeof(prod_id))) |