From 66e7f54e2e9f9fc6671270db0e685891591a83d9 Mon Sep 17 00:00:00 2001
From: Laurent Pinchart <laurent.pinchart@skynet.be>
Date: Mon, 7 Jul 2008 23:04:29 -0300
Subject: [PATCH] --- yaml --- r: 103933 b: refs/heads/master c:
 6833c917b4de1757febdbf946d709ece6dc7a86f h: refs/heads/master i:   103931:
 ef4e4b7da291b1ace299d7c9e5ed4b44e8f02d1a v: v3

---
 [refs]                                     |  2 +-
 trunk/drivers/media/video/uvc/Kconfig      | 17 +++++++++++++++++
 trunk/drivers/media/video/uvc/uvc_status.c | 17 +++++++++++++++--
 3 files changed, 33 insertions(+), 3 deletions(-)
 create mode 100644 trunk/drivers/media/video/uvc/Kconfig

diff --git a/[refs] b/[refs]
index 3e7b0b7c35d5..4ba497b309bb 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ac0d6df69bc72eabda944fd14a958074dc08ca0c
+refs/heads/master: 6833c917b4de1757febdbf946d709ece6dc7a86f
diff --git a/trunk/drivers/media/video/uvc/Kconfig b/trunk/drivers/media/video/uvc/Kconfig
new file mode 100644
index 000000000000..c2d9760de832
--- /dev/null
+++ b/trunk/drivers/media/video/uvc/Kconfig
@@ -0,0 +1,17 @@
+config USB_VIDEO_CLASS
+	tristate "USB Video Class (UVC)"
+	---help---
+	  Support for the USB Video Class (UVC).  Currently only video
+	  input devices, such as webcams, are supported.
+
+	  For more information see: <http://linux-uvc.berlios.de/>
+
+config USB_VIDEO_CLASS_INPUT_EVDEV
+	bool "UVC input events device support"
+	default y
+	depends on USB_VIDEO_CLASS && INPUT
+	---help---
+	  This option makes USB Video Class devices register an input device
+	  to report button events.
+
+	  If you are in doubt, say Y.
diff --git a/trunk/drivers/media/video/uvc/uvc_status.c b/trunk/drivers/media/video/uvc/uvc_status.c
index 7bfddad37d8c..75e678ac54eb 100644
--- a/trunk/drivers/media/video/uvc/uvc_status.c
+++ b/trunk/drivers/media/video/uvc/uvc_status.c
@@ -22,6 +22,7 @@
 /* --------------------------------------------------------------------------
  * Input device
  */
+#ifdef CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV
 static int uvc_input_init(struct uvc_device *dev)
 {
 	struct usb_device *udev = dev->udev;
@@ -67,6 +68,19 @@ static void uvc_input_cleanup(struct uvc_device *dev)
 		input_unregister_device(dev->input);
 }
 
+static void uvc_input_report_key(struct uvc_device *dev, unsigned int code,
+	int value)
+{
+	if (dev->input)
+		input_report_key(dev->input, code, value);
+}
+
+#else
+#define uvc_input_init(dev)
+#define uvc_input_cleanup(dev)
+#define uvc_input_report_key(dev, code, value)
+#endif /* CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV */
+
 /* --------------------------------------------------------------------------
  * Status interrupt endpoint
  */
@@ -83,8 +97,7 @@ static void uvc_event_streaming(struct uvc_device *dev, __u8 *data, int len)
 			return;
 		uvc_trace(UVC_TRACE_STATUS, "Button (intf %u) %s len %d\n",
 			data[1], data[3] ? "pressed" : "released", len);
-		if (dev->input)
-			input_report_key(dev->input, BTN_0, data[3]);
+		uvc_input_report_key(dev, BTN_0, data[3]);
 	} else {
 		uvc_trace(UVC_TRACE_STATUS, "Stream %u error event %02x %02x "
 			"len %d.\n", data[1], data[2], data[3], len);