From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756481Ab2CPTDU (ORCPT ); Fri, 16 Mar 2012 15:03:20 -0400 Received: from mga09.intel.com ([134.134.136.24]:20115 "EHLO mga09.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755743Ab2CPTBL (ORCPT ); Fri, 16 Mar 2012 15:01:11 -0400 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.67,352,1309762800"; d="scan'208";a="118439718" From: Andi Kleen To: linux-kernel@vger.kernel.org Cc: Andi Kleen , balbi@ti.com, gregkh@linuxfoundation.org Subject: [PATCH 09/11] usb: gadget: f_fs: Remove lock is held before freeing checks Date: Fri, 16 Mar 2012 12:01:02 -0700 Message-Id: <1331924464-18023-10-git-send-email-andi@firstfloor.org> X-Mailer: git-send-email 1.7.7.6 In-Reply-To: <1331924464-18023-1-git-send-email-andi@firstfloor.org> References: <1331924464-18023-1-git-send-email-andi@firstfloor.org> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Andi Kleen lock debugging already supports this, no need to do it explicitely. Cc: balbi@ti.com Cc: gregkh@linuxfoundation.org Signed-off-by: Andi Kleen --- drivers/usb/gadget/f_fs.c | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/drivers/usb/gadget/f_fs.c b/drivers/usb/gadget/f_fs.c index f63dc6c..c5e8994 100644 --- a/drivers/usb/gadget/f_fs.c +++ b/drivers/usb/gadget/f_fs.c @@ -1258,9 +1258,7 @@ static void ffs_data_put(struct ffs_data *ffs) if (unlikely(atomic_dec_and_test(&ffs->ref))) { pr_info("%s(): freeing\n", __func__); ffs_data_clear(ffs); - BUG_ON(mutex_is_locked(&ffs->mutex) || - spin_is_locked(&ffs->ev.waitq.lock) || - waitqueue_active(&ffs->ev.waitq) || + BUG_ON(waitqueue_active(&ffs->ev.waitq) || waitqueue_active(&ffs->ep0req_completion.wait)); kfree(ffs); } -- 1.7.7.6