From patchwork Sun Jun 20 11:24:35 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julia Lawall X-Patchwork-Id: 107043 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.3/8.14.3) with ESMTP id o5KBPEbX006291 for ; Sun, 20 Jun 2010 11:25:14 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751303Ab0FTLYl (ORCPT ); Sun, 20 Jun 2010 07:24:41 -0400 Received: from mgw2.diku.dk ([130.225.96.92]:48724 "EHLO mgw2.diku.dk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751051Ab0FTLYk (ORCPT ); Sun, 20 Jun 2010 07:24:40 -0400 Received: from localhost (localhost [127.0.0.1]) by mgw2.diku.dk (Postfix) with ESMTP id EC8C719BB47; Sun, 20 Jun 2010 13:24:39 +0200 (CEST) Received: from mgw2.diku.dk ([127.0.0.1]) by localhost (mgw2.diku.dk [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 08248-09; Sun, 20 Jun 2010 13:24:35 +0200 (CEST) Received: from nhugin.diku.dk (nhugin.diku.dk [130.225.96.140]) by mgw2.diku.dk (Postfix) with ESMTP id C782719BB3D; Sun, 20 Jun 2010 13:24:35 +0200 (CEST) Received: from ask.diku.dk (ask.diku.dk [130.225.96.225]) by nhugin.diku.dk (Postfix) with ESMTP id 01FD96DF84F; Sun, 20 Jun 2010 13:16:37 +0200 (CEST) Received: by ask.diku.dk (Postfix, from userid 3767) id ADC41200BF; Sun, 20 Jun 2010 13:24:35 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by ask.diku.dk (Postfix) with ESMTP id A5DF8200BD; Sun, 20 Jun 2010 13:24:35 +0200 (CEST) Date: Sun, 20 Jun 2010 13:24:35 +0200 (CEST) From: Julia Lawall To: Jiri Kosina , linux-input@vger.kernel.org, linux-kernel@vger.kernel.org, kernel-janitors@vger.kernel.org Subject: [PATCH 1/2] drivers/hid: Eliminate a double lock Message-ID: MIME-Version: 1.0 Sender: linux-input-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]); Sun, 20 Jun 2010 11:25:14 +0000 (UTC) diff --git a/drivers/hid/hid-debug.c b/drivers/hid/hid-debug.c index c940267..850d02a 100644 --- a/drivers/hid/hid-debug.c +++ b/drivers/hid/hid-debug.c @@ -949,8 +949,8 @@ static ssize_t hid_debug_events_read(struct file *file, char __user *buffer, int ret = 0, len; DECLARE_WAITQUEUE(wait, current); + mutex_lock(&list->read_mutex); while (ret == 0) { - mutex_lock(&list->read_mutex); if (list->head == list->tail) { add_wait_queue(&list->hdev->debug_wait, &wait); set_current_state(TASK_INTERRUPTIBLE);