From patchwork Sat Aug 17 16:24:51 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ming Lei X-Patchwork-Id: 2846000 Return-Path: X-Original-To: patchwork-linux-input@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id D52E99F2F5 for ; Sat, 17 Aug 2013 16:29:36 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id EF5142022F for ; Sat, 17 Aug 2013 16:29:35 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 1037D201DA for ; Sat, 17 Aug 2013 16:29:35 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753848Ab3HQQ3e (ORCPT ); Sat, 17 Aug 2013 12:29:34 -0400 Received: from mail-pd0-f173.google.com ([209.85.192.173]:55852 "EHLO mail-pd0-f173.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753571Ab3HQQ3d (ORCPT ); Sat, 17 Aug 2013 12:29:33 -0400 Received: by mail-pd0-f173.google.com with SMTP id p10so3385489pdj.32 for ; Sat, 17 Aug 2013 09:29:33 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=P2UtbIbnv49qJYUCqaOFTTpgholBnkzIPPw+PsVXPI0=; b=fRWysjQef6MEqSG3NV2MOEf92gLAzvmUBAR0qtZzyTw448XWBAIDa0NGqeZAFeT96c pxWmSIuFlELxKbGH8btLID90CbqAT4oE2o9nyXbno27MUVLYngXx6n0wqqBsnx7yGynN 9+uuJaydCZccjhdPgyBPI7PU73lM8u8nDFpjm/2c8NEotzuAJg4zukVBmASOcbotAnIQ fFDH+vZQ9vtFcwkSrVomi2FycIHJv6jiuvBMWBsMHm1PXK7BcVDftLbJk/zuzqdbLt2p A25W5rpkNhCTo2+diy6Bi/cLgiFRW36fnf/iMaw6adVqZk1eM6DoYVBC3Dj3jZztYK8v lyzQ== X-Received: by 10.68.139.201 with SMTP id ra9mr3722591pbb.46.1376756973000; Sat, 17 Aug 2013 09:29:33 -0700 (PDT) Received: from localhost ([183.37.213.217]) by mx.google.com with ESMTPSA id sz6sm4840896pab.5.1969.12.31.16.00.00 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Sat, 17 Aug 2013 09:29:32 -0700 (PDT) From: Ming Lei To: Greg Kroah-Hartman Cc: linux-usb@vger.kernel.org, Oliver Neukum , Alan Stern , Ming Lei , Dmitry Torokhov , linux-input@vger.kernel.org Subject: [PATCH v1 26/49] input: cm109: prepare for enabling irq in complete() Date: Sun, 18 Aug 2013 00:24:51 +0800 Message-Id: <1376756714-25479-27-git-send-email-ming.lei@canonical.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1376756714-25479-1-git-send-email-ming.lei@canonical.com> References: <1376756714-25479-1-git-send-email-ming.lei@canonical.com> Sender: linux-input-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org X-Spam-Status: No, score=-9.6 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Complete() will be run with interrupt enabled, so change to spin_lock_irqsave(). Cc: Dmitry Torokhov Cc: linux-input@vger.kernel.org Signed-off-by: Ming Lei Acked-by: Dmitry Torokhov --- drivers/input/misc/cm109.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/drivers/input/misc/cm109.c b/drivers/input/misc/cm109.c index 082684e..cac4e37 100644 --- a/drivers/input/misc/cm109.c +++ b/drivers/input/misc/cm109.c @@ -340,6 +340,7 @@ static void cm109_urb_irq_callback(struct urb *urb) struct cm109_dev *dev = urb->context; const int status = urb->status; int error; + unsigned long flags; dev_dbg(&dev->intf->dev, "### URB IRQ: [0x%02x 0x%02x 0x%02x 0x%02x] keybit=0x%02x\n", dev->irq_data->byte[0], @@ -379,7 +380,7 @@ static void cm109_urb_irq_callback(struct urb *urb) out: - spin_lock(&dev->ctl_submit_lock); + spin_lock_irqsave(&dev->ctl_submit_lock, flags); dev->irq_urb_pending = 0; @@ -403,7 +404,7 @@ static void cm109_urb_irq_callback(struct urb *urb) __func__, error); } - spin_unlock(&dev->ctl_submit_lock); + spin_unlock_irqrestore(&dev->ctl_submit_lock, flags); } static void cm109_urb_ctl_callback(struct urb *urb) @@ -411,6 +412,7 @@ static void cm109_urb_ctl_callback(struct urb *urb) struct cm109_dev *dev = urb->context; const int status = urb->status; int error; + unsigned long flags; dev_dbg(&dev->intf->dev, "### URB CTL: [0x%02x 0x%02x 0x%02x 0x%02x]\n", dev->ctl_data->byte[0], @@ -421,7 +423,7 @@ static void cm109_urb_ctl_callback(struct urb *urb) if (status) dev_err(&dev->intf->dev, "%s: urb status %d\n", __func__, status); - spin_lock(&dev->ctl_submit_lock); + spin_lock_irqsave(&dev->ctl_submit_lock, flags); dev->ctl_urb_pending = 0; @@ -442,7 +444,7 @@ static void cm109_urb_ctl_callback(struct urb *urb) } } - spin_unlock(&dev->ctl_submit_lock); + spin_unlock_irqrestore(&dev->ctl_submit_lock, flags); } static void cm109_toggle_buzzer_async(struct cm109_dev *dev)