From: Erik Andrén <erik.andren@gmail.com>
Date: Mon, 27 Apr 2009 18:41:45 +0000 (-0300)
Subject: V4L/DVB (11649): gspca - m5602: Probe the ov7660 sensor
X-Git-Tag: v2.6.31-rc1~297^2~279
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=7b8265033d3ca5425e4fbdb77f9ccd3375f3f117;p=karo-tx-linux.git

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>
---

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))