From f6c24e1200baef6b7603ceba408cb9ac08e5c543 Mon Sep 17 00:00:00 2001
From: Hans de Goede <hdegoede@redhat.com>
Date: Fri, 19 Feb 2010 04:28:39 -0300
Subject: [PATCH] --- yaml --- r: 181759 b: refs/heads/master c:
 ac82f59f9cc6aae3300430fcc3422e59f83d89ae h: refs/heads/master i:   181757:
 1ff16b0a94dc6d12f386a7766682af133c01c321   181755:
 8d4730f3223794bc7198c8dd5479e6fa8e14f51f   181751:
 1678108c48f07e8f6b466a0a6e8b184fc9892a99   181743:
 eeb96052d81fa2d2c055b3c8af97abc9569a429e   181727:
 56935abc8bce52b9e79341f8a78f1a215360ccb6   181695:
 c3bfbcd34548cd33cf9f9618ffefbd13d082981d   181631:
 f5c6fd65d86b3ce8c078d6cd71fe4f61308e6838   181503:
 0b9295fa6c0ddcd6d1427281ae022e7e9da960eb   181247:
 ea02f4fd95a6a74886335a82fdc6acd59758ccf7 v: v3

---
 [refs]                                  | 2 +-
 trunk/drivers/media/video/gspca/gspca.c | 2 +-
 trunk/drivers/media/video/gspca/gspca.h | 3 +++
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index efbea8cdb474..39ce1291704a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5fb2dde28122e74bbab9dae3cc04bcbc8c08b332
+refs/heads/master: ac82f59f9cc6aae3300430fcc3422e59f83d89ae
diff --git a/trunk/drivers/media/video/gspca/gspca.c b/trunk/drivers/media/video/gspca/gspca.c
index 2c662ed91b5b..d9a934b99a89 100644
--- a/trunk/drivers/media/video/gspca/gspca.c
+++ b/trunk/drivers/media/video/gspca/gspca.c
@@ -158,7 +158,7 @@ static int gspca_input_connect(struct gspca_dev *dev)
 	int err = 0;
 
 	dev->input_dev = NULL;
-	if (dev->sd_desc->int_pkt_scan)  {
+	if (dev->sd_desc->int_pkt_scan || dev->sd_desc->other_input)  {
 		input_dev = input_allocate_device();
 		if (!input_dev)
 			return -ENOMEM;
diff --git a/trunk/drivers/media/video/gspca/gspca.h b/trunk/drivers/media/video/gspca/gspca.h
index 0ed254b496a5..02c696a22be0 100644
--- a/trunk/drivers/media/video/gspca/gspca.h
+++ b/trunk/drivers/media/video/gspca/gspca.h
@@ -131,6 +131,9 @@ struct sd_desc {
 	cam_ident_op get_chip_ident;
 #ifdef CONFIG_INPUT
 	cam_int_pkt_op int_pkt_scan;
+	/* other_input makes the gspca core create gspca_dev->input even when
+	   int_pkt_scan is NULL, for cams with non interrupt driven buttons */
+	u8 other_input;
 #endif
 };