From patchwork Mon May 3 15:42:46 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sakari Ailus X-Patchwork-Id: 3289 Return-path: Envelope-to: mchehab@infradead.org Delivery-date: Mon, 03 May 2010 15:42:56 +0000 Received: from bombadil.infradead.org [18.85.46.34] by pedra with IMAP (fetchmail-6.3.6) for (single-drop); Mon, 03 May 2010 12:47:04 -0300 (BRT) Received: from vger.kernel.org ([209.132.180.67]) by bombadil.infradead.org with esmtp (Exim 4.69 #1 (Red Hat Linux)) id 1O8xnM-0003aQ-NO; Mon, 03 May 2010 15:42:56 +0000 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932855Ab0ECPmz (ORCPT + 1 other); Mon, 3 May 2010 11:42:55 -0400 Received: from smtp.nokia.com ([192.100.122.233]:28544 "EHLO mgw-mx06.nokia.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932822Ab0ECPmz (ORCPT ); Mon, 3 May 2010 11:42:55 -0400 Received: from vaebh105.NOE.Nokia.com (vaebh105.europe.nokia.com [10.160.244.31]) by mgw-mx06.nokia.com (Switch-3.3.3/Switch-3.3.3) with ESMTP id o43Fgo9E010894; Mon, 3 May 2010 18:42:51 +0300 Received: from esebh102.NOE.Nokia.com ([172.21.138.183]) by vaebh105.NOE.Nokia.com with Microsoft SMTPSVC(6.0.3790.3959); Mon, 3 May 2010 18:42:50 +0300 Received: from mgw-da01.ext.nokia.com ([147.243.128.24]) by esebh102.NOE.Nokia.com over TLS secured channel with Microsoft SMTPSVC(6.0.3790.3959); Mon, 3 May 2010 18:42:49 +0300 Received: from maxwell.research.nokia.com (maxwell.research.nokia.com [172.21.50.162]) by mgw-da01.ext.nokia.com (Switch-3.3.3/Switch-3.3.3) with ESMTP id o43FgkPs016710 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Mon, 3 May 2010 18:42:48 +0300 Received: from kaali.localdomain (kaali.localdomain [192.168.239.7]) by maxwell.research.nokia.com (Postfix) with ESMTPS id C0AB470083; Mon, 3 May 2010 18:42:46 +0300 (EEST) Received: from sailus by kaali.localdomain with local (Exim 4.69) (envelope-from ) id 1O8xnC-0002h8-Df; Mon, 03 May 2010 18:42:46 +0300 From: Sakari Ailus To: linux-media@vger.kernel.org Cc: laurent.pinchart@ideasonboard.com Subject: [PATCH 1/1] V4L: Events: Replace bad WARN_ON() with assert_spin_locked() Date: Mon, 3 May 2010 18:42:46 +0300 Message-Id: <1272901366-7127-1-git-send-email-sakari.ailus@maxwell.research.nokia.com> X-Mailer: git-send-email 1.5.6.5 In-Reply-To: <4BDEEEDF.7050905@maxwell.research.nokia.com> References: <4BDEEEDF.7050905@maxwell.research.nokia.com> X-OriginalArrivalTime: 03 May 2010 15:42:50.0191 (UTC) FILETIME=[49499DF0:01CAEAD7] X-Nokia-AV: Clean Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org spin_is_locked() always returns zero when spinlock debugging is disabled on a single CPU machine. Replace WARN_ON() with assert_spin_locked(). Thanks to Laurent Pinchart for spotting this! Signed-off-by: Sakari Ailus Acked-by: Laurent Pinchart --- drivers/media/video/v4l2-event.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/drivers/media/video/v4l2-event.c b/drivers/media/video/v4l2-event.c index 170e40f..91bb1c8 100644 --- a/drivers/media/video/v4l2-event.c +++ b/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)