From d1707a3380ab6d3ea21a512902fd75b660e22999 Mon Sep 17 00:00:00 2001
From: Hans de Goede <hdegoede@redhat.com>
Date: Mon, 24 Oct 2011 05:03:27 -0300
Subject: [PATCH] --- yaml --- r: 275367 b: refs/heads/master c:
 b36b505965e374b284166c2e6b9c1d369d663ea9 h: refs/heads/master i:   275365:
 92525721cf76d238913dc119cf5308a7c392afc5   275363:
 1e4090f07fc59b382bc8f09180a09d658ba15204   275359:
 c024d251ad9c95a1b6208a8cc110c7bb3a0597fc v: v3

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

diff --git a/[refs] b/[refs]
index cea7340d94cc..65816218e577 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 60659dd49509f255ad9748411cd4eb3c74a8d8a9
+refs/heads/master: b36b505965e374b284166c2e6b9c1d369d663ea9
diff --git a/trunk/drivers/media/video/v4l2-event.c b/trunk/drivers/media/video/v4l2-event.c
index 53b190cf225e..9f56f18d509f 100644
--- a/trunk/drivers/media/video/v4l2-event.c
+++ b/trunk/drivers/media/video/v4l2-event.c
@@ -215,6 +215,9 @@ int v4l2_event_subscribe(struct v4l2_fh *fh,
 	unsigned long flags;
 	unsigned i;
 
+	if (sub->type == V4L2_EVENT_ALL)
+		return -EINVAL;
+
 	if (elems < 1)
 		elems = 1;
 	if (sub->type == V4L2_EVENT_CTRL) {