From 7819b560883467213856244180689cc85b442658 Mon Sep 17 00:00:00 2001 From: Sakari Ailus Date: Mon, 3 May 2010 12:42:46 -0300 Subject: [PATCH] --- yaml --- r: 193075 b: refs/heads/master c: f3cd385a9c95e1ea90e886448ab1e83ee2fc7e51 h: refs/heads/master i: 193073: 68a13a0477bc8b1ce07d3e1fcae2ec4ba86f7933 193071: 9d53dfa3df66984acc46f3500f695daaa829399b v: v3 --- [refs] | 2 +- trunk/drivers/media/video/v4l2-event.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index d7daa0642fb9..d8e18958d9a6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5a11b6fe5d5ff146d951bc237c0e3f0330711baa +refs/heads/master: f3cd385a9c95e1ea90e886448ab1e83ee2fc7e51 diff --git a/trunk/drivers/media/video/v4l2-event.c b/trunk/drivers/media/video/v4l2-event.c index 170e40f56cf7..91bb1c823992 100644 --- a/trunk/drivers/media/video/v4l2-event.c +++ b/trunk/drivers/media/video/v4l2-event.c @@ -152,7 +152,7 @@ static struct v4l2_subscribed_event *v4l2_event_subscribed( struct v4l2_events *events = fh->events; struct v4l2_subscribed_event *sev; - WARN_ON(!spin_is_locked(&fh->vdev->fh_lock)); + assert_spin_locked(&fh->vdev->fh_lock); list_for_each_entry(sev, &events->subscribed, list) { if (sev->type == type)