summaryrefslogtreecommitdiffstats
path: root/drivers/media/video
diff options
context:
space:
mode:
authorErik Andrén <erik.andren@gmail.com>2009-04-27 15:41:45 -0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2009-06-16 18:20:49 -0300
commit7b8265033d3ca5425e4fbdb77f9ccd3375f3f117 (patch)
treead3c61439ccf5627ebe273eebf6b200b350457e8 /drivers/media/video
parent52fa70b7f448da8b763e8c2f566d309d7399a20b (diff)
downloadblackbird-op-linux-7b8265033d3ca5425e4fbdb77f9ccd3375f3f117.tar.gz
blackbird-op-linux-7b8265033d3ca5425e4fbdb77f9ccd3375f3f117.zip
V4L/DVB (11649): gspca - m5602: Probe the ov7660 sensor
Signed-off-by: Erik Andrén <erik.andren@gmail.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video')
-rw-r--r--drivers/media/video/gspca/m5602/m5602_core.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/media/video/gspca/m5602/m5602_core.c b/drivers/media/video/gspca/m5602/m5602_core.c
index 8ca5643f2c7a..36bdcda8417e 100644
--- a/drivers/media/video/gspca/m5602/m5602_core.c
+++ b/drivers/media/video/gspca/m5602/m5602_core.c
@@ -17,6 +17,7 @@
*/
#include "m5602_ov9650.h"
+#include "m5602_ov7660.h"
#include "m5602_mt9m111.h"
#include "m5602_po1030.h"
#include "m5602_s5k83a.h"
@@ -217,6 +218,11 @@ static int m5602_probe_sensor(struct sd *sd)
if (!sd->sensor->probe(sd))
return 0;
+ /* Try the ov7660 */
+ sd->sensor = &ov7660;
+ if (!sd->sensor->probe(sd))
+ return 0;
+
/* Try the s5k83a */
sd->sensor = &s5k83a;
if (!sd->sensor->probe(sd))
OpenPOWER on IntegriCloud