From f22ef93a1c53f9fabb433b58cd08a1625ab6f0a1 Mon Sep 17 00:00:00 2001
From: Mauro Carvalho Chehab <mchehab@redhat.com>
Date: Sat, 19 Sep 2009 00:49:11 -0300
Subject: [PATCH] --- yaml --- r: 164252 b: refs/heads/master c:
 0030ec38ce5b50a77287a22bf88a65338da21547 h: refs/heads/master v: v3

---
 [refs]                                        | 2 +-
 trunk/drivers/media/video/gspca/gl860/gl860.c | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index b955102deaa5..f41040845e59 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ab2058571dc6028e2ff0809ef37c9ae2461b0c74
+refs/heads/master: 0030ec38ce5b50a77287a22bf88a65338da21547
diff --git a/trunk/drivers/media/video/gspca/gl860/gl860.c b/trunk/drivers/media/video/gspca/gl860/gl860.c
index 62f4320fd9d8..6ef59ac7f502 100644
--- a/trunk/drivers/media/video/gspca/gl860/gl860.c
+++ b/trunk/drivers/media/video/gspca/gl860/gl860.c
@@ -129,6 +129,8 @@ static int gl860_build_control_table(struct gspca_dev *gspca_dev)
 		sd_ctrls = sd_ctrls_ov2640;
 	else if (_OV9655_)
 		sd_ctrls = sd_ctrls_ov9655;
+	else
+		return 0;
 
 	memset(sd_ctrls, 0, GL860_NCTRLS * sizeof(struct ctrl));