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) {