From 6001b761057945ffc3242ced19de3ca9da3d8a2f Mon Sep 17 00:00:00 2001
From: Hans de Goede <hdegoede@redhat.com>
Date: Sun, 1 Jan 2012 16:09:17 -0300
Subject: [PATCH] --- yaml --- r: 285695 b: refs/heads/master c:
 ee186fd96a5f98f971316d26822b94c331d56a57 h: refs/heads/master i:   285693:
 a1105d60209ff76494c48a5698f482cb98eb5325   285691:
 4ef86906478f6b6374139866188abee1237a063a   285687:
 f3dcdd3f8305224c10a8b06abe259edb485d44aa   285679:
 4f6ad44ccaa01651932d170c518c627bbbc32173   285663:
 6d5abc66e4f2b93136e2fdc57d6678e75c49bcd0   285631:
 3abf507ca2e180156cb580036b2862ba83ce8de2   285567:
 c7b9c12e643770170b212f3fafd4ad60fab8158b   285439:
 3f73f14a5337acf107275770d7cb6b32ea9d79e5   285183:
 72c95682c71bc90a00800bb426018585271e697b   284671:
 f5eec5e12b3479b7ebab9615d97c3c1300b54b6e v: v3

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

diff --git a/[refs] b/[refs]
index baaaa86de135..5c32b272d203 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0218d53a12a1b90d261b6f9cf0a4cee38d230916
+refs/heads/master: ee186fd96a5f98f971316d26822b94c331d56a57
diff --git a/trunk/drivers/media/video/gspca/t613.c b/trunk/drivers/media/video/gspca/t613.c
index 90f0877eb599..c22d4e810f8d 100644
--- a/trunk/drivers/media/video/gspca/t613.c
+++ b/trunk/drivers/media/video/gspca/t613.c
@@ -30,6 +30,7 @@
 
 #define MODULE_NAME "t613"
 
+#include <linux/input.h>
 #include <linux/slab.h>
 #include "gspca.h"
 
@@ -57,6 +58,7 @@ struct sd {
 	u8 effect;
 
 	u8 sensor;
+	u8 button_pressed;
 };
 enum sensors {
 	SENSOR_OM6802,
@@ -1095,15 +1097,35 @@ static void sd_stopN(struct gspca_dev *gspca_dev)
 		msleep(20);
 		reg_w(gspca_dev, 0x0309);
 	}
+#if defined(CONFIG_INPUT) || defined(CONFIG_INPUT_MODULE)
+	/* If the last button state is pressed, release it now! */
+	if (sd->button_pressed) {
+		input_report_key(gspca_dev->input_dev, KEY_CAMERA, 0);
+		input_sync(gspca_dev->input_dev);
+		sd->button_pressed = 0;
+	}
+#endif
 }
 
 static void sd_pkt_scan(struct gspca_dev *gspca_dev,
 			u8 *data,			/* isoc packet */
 			int len)			/* iso packet length */
 {
+	struct sd *sd = (struct sd *) gspca_dev;
 	int pkt_type;
 
 	if (data[0] == 0x5a) {
+#if defined(CONFIG_INPUT) || defined(CONFIG_INPUT_MODULE)
+		if (len > 20) {
+			u8 state = (data[20] & 0x80) ? 1 : 0;
+			if (sd->button_pressed != state) {
+				input_report_key(gspca_dev->input_dev,
+						 KEY_CAMERA, state);
+				input_sync(gspca_dev->input_dev);
+				sd->button_pressed = state;
+			}
+		}
+#endif
 		/* Control Packet, after this came the header again,
 		 * but extra bytes came in the packet before this,
 		 * sometimes an EOF arrives, sometimes not... */
@@ -1410,6 +1432,9 @@ static const struct sd_desc sd_desc = {
 	.stopN = sd_stopN,
 	.pkt_scan = sd_pkt_scan,
 	.querymenu = sd_querymenu,
+#if defined(CONFIG_INPUT) || defined(CONFIG_INPUT_MODULE)
+	.other_input = 1,
+#endif
 };
 
 /* -- module initialisation -- */