Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland...

[pandora-kernel.git] / drivers / media / video / v4l2-event.c

diff --git a/drivers/media/video/v4l2-event.c b/drivers/media/video/v4l2-event.c
index 4d01f17..c26ad96 100644 (file)
--- a/drivers/media/video/v4l2-event.c
+++ b/drivers/media/video/v4l2-event.c
@@ -29,6 +29,7 @@
 
 #include <linux/sched.h>
 #include <linux/slab.h>
+#include <linux/export.h>
 
 static unsigned sev_pos(const struct v4l2_subscribed_event *sev, unsigned idx)
 {
@@ -302,7 +303,6 @@ int v4l2_event_unsubscribe(struct v4l2_fh *fh,
                        fh->navailable--;
                }
                list_del(&sev->list);
-               sev->fh = NULL;
        }
 
        spin_unlock_irqrestore(&fh->vdev->fh_lock, flags);