From dc42619954f1b4c4a52cfee97fb15a8ac980b99c Mon Sep 17 00:00:00 2001
From: Hans Verkuil <hans.verkuil@cisco.com>
Date: Sun, 6 May 2012 09:28:20 -0300
Subject: [PATCH] --- yaml --- r: 306303 b: refs/heads/master c:
 d57fb9f8a69deb521ffabac02d2fea484141e59c h: refs/heads/master i:   306301:
 ebe715f1071dfada2dff951ef49bc1d95e07e72c   306299:
 eb459ba935547f453d5e73a9384cfea16855f33d   306295:
 76c2c3a0d843c10d2a03e0f073bba1cfa01c7114   306287:
 1d24c556efab3d7092d1f2ad5c8a10de0e485514   306271:
 5e1735c46a427721fd728e67793bbb7fdafa3562   306239:
 1db134bd48c879a6616b48a8a81793bb2005a91a   306175:
 d01b6ffa1670d46c708de2bb720a81176b2fda59 v: v3

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

diff --git a/[refs] b/[refs]
index 6d457fdbcb55..e18bbac1420b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2333565d94c1efd199782bdedc9f4d9b06198583
+refs/heads/master: d57fb9f8a69deb521ffabac02d2fea484141e59c
diff --git a/trunk/drivers/media/video/gspca/gspca.c b/trunk/drivers/media/video/gspca/gspca.c
index ed33a8773f7e..9fe723c6acb4 100644
--- a/trunk/drivers/media/video/gspca/gspca.c
+++ b/trunk/drivers/media/video/gspca/gspca.c
@@ -40,6 +40,7 @@
 #include <media/v4l2-ioctl.h>
 #include <media/v4l2-ctrls.h>
 #include <media/v4l2-fh.h>
+#include <media/v4l2-event.h>
 
 #include "gspca.h"
 
@@ -2158,6 +2159,7 @@ static unsigned int dev_poll(struct file *file, poll_table *wait)
 		ret = POLLIN | POLLRDNORM;	/* yes */
 	else
 		ret = 0;
+	ret |= v4l2_ctrl_poll(file, wait);
 	mutex_unlock(&gspca_dev->queue_lock);
 	if (!gspca_dev->present)
 		return POLLHUP;
@@ -2269,6 +2271,8 @@ static const struct v4l2_ioctl_ops dev_ioctl_ops = {
 	.vidioc_s_register	= vidioc_s_register,
 #endif
 	.vidioc_g_chip_ident	= vidioc_g_chip_ident,
+	.vidioc_subscribe_event = v4l2_ctrl_subscribe_event,
+	.vidioc_unsubscribe_event = v4l2_event_unsubscribe,
 };
 
 static const struct video_device gspca_template = {