From patchwork Sun Jul 15 06:00:33 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ezequiel Garcia X-Patchwork-Id: 1198451 Return-Path: X-Original-To: patchwork-linux-media@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork1.kernel.org (Postfix) with ESMTP id 040F63FC5A for ; Sun, 15 Jul 2012 06:01:27 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1750994Ab2GOGAr (ORCPT ); Sun, 15 Jul 2012 02:00:47 -0400 Received: from mail-yw0-f46.google.com ([209.85.213.46]:60243 "EHLO mail-yw0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750935Ab2GOGAq (ORCPT ); Sun, 15 Jul 2012 02:00:46 -0400 Received: by yhmm54 with SMTP id m54so4733198yhm.19 for ; Sat, 14 Jul 2012 23:00:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer; bh=dUhdruX91RCX0voZEUt6Ry0jUa5/hHnJUkg1YMfxGSg=; b=JVeAXX5K1vDZoFHhLIkETOrcRI/q1+/hxm4kdRajLTFZHjdvYi7+70Gz7Qlgz9ofRy +Id9i08nrsmnt83IP+79T9MunleboxRqspvzFBYhxM3SP26Iny4r4HWPsdctSmQrG6SU uye2pJSS9VIJevrHJ5vnHmsT/YGho8mrnVAf69CfB5dH/F4Y8ccJlyehnvOv9pjHZJuM P/3cF7QZxxIXRSwR3yCyQPIyds0BM5G6lamDuD39m+3IxASsSzplvWTex3Wy9peeZxNr IJ1G1JZJ/jzzBgw6PpXq/mAHfFEvvNPgV5Aj+ag/GMWJI0nHGxf73H6l83nz5kFKAs3D XktA== Received: by 10.101.116.16 with SMTP id t16mr1805794anm.27.1342332046063; Sat, 14 Jul 2012 23:00:46 -0700 (PDT) Received: from localhost.localdomain (201-212-117-99.prima.net.ar. [201.212.117.99]) by mx.google.com with ESMTPS id e5sm11411323ani.18.2012.07.14.23.00.44 (version=TLSv1/SSLv3 cipher=OTHER); Sat, 14 Jul 2012 23:00:45 -0700 (PDT) From: Ezequiel Garcia To: Mauro Carvalho Chehab Cc: , Ezequiel Garcia , Hans Verkuil Subject: [PATCH] pwc: Use vb2 queue mutex through a single name Date: Sun, 15 Jul 2012 03:00:33 -0300 Message-Id: <1342332033-30250-1-git-send-email-elezegarcia@gmail.com> X-Mailer: git-send-email 1.7.8.6 Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org This lock was being taken using two different names (pointers) in the same function. Both names refer to the same lock, so this wasn't an error; but it looked very strange. Cc: Hans Verkuil Signed-off-by: Ezequiel Garcia --- drivers/media/video/pwc/pwc-if.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/drivers/media/video/pwc/pwc-if.c b/drivers/media/video/pwc/pwc-if.c index de7c7ba..b5d0729 100644 --- a/drivers/media/video/pwc/pwc-if.c +++ b/drivers/media/video/pwc/pwc-if.c @@ -1127,7 +1127,7 @@ static void usb_pwc_disconnect(struct usb_interface *intf) v4l2_device_disconnect(&pdev->v4l2_dev); video_unregister_device(&pdev->vdev); mutex_unlock(&pdev->v4l2_lock); - mutex_unlock(pdev->vb_queue.lock); + mutex_unlock(&pdev->vb_queue_lock); #ifdef CONFIG_USB_PWC_INPUT_EVDEV if (pdev->button_dev)