linux-input.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Ming Lei <ming.lei@canonical.com>
To: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: linux-usb@vger.kernel.org, Oliver Neukum <oliver@neukum.org>,
	Alan Stern <stern@rowland.harvard.edu>,
	linux-input@vger.kernel.org, linux-bluetooth@vger.kernel.org,
	netdev@vger.kernel.org, linux-wireless@vger.kernel.org,
	linux-media@vger.kernel.org, alsa-devel@alsa-project.org,
	Ming Lei <ming.lei@canonical.com>
Subject: [PATCH 06/50] USB: iowarrior: spin_lock in complete() cleanup
Date: Thu, 11 Jul 2013 17:05:29 +0800	[thread overview]
Message-ID: <1373533573-12272-7-git-send-email-ming.lei@canonical.com> (raw)
In-Reply-To: <1373533573-12272-1-git-send-email-ming.lei@canonical.com>

Complete() will be run with interrupt enabled, so change to
spin_lock_irqsave().

Signed-off-by: Ming Lei <ming.lei@canonical.com>
---
 drivers/usb/misc/iowarrior.c |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/drivers/usb/misc/iowarrior.c b/drivers/usb/misc/iowarrior.c
index d36f34e..010ed6d 100644
--- a/drivers/usb/misc/iowarrior.c
+++ b/drivers/usb/misc/iowarrior.c
@@ -162,6 +162,7 @@ static void iowarrior_callback(struct urb *urb)
 	int offset;
 	int status = urb->status;
 	int retval;
+	unsigned long flags;
 
 	switch (status) {
 	case 0:
@@ -175,7 +176,7 @@ static void iowarrior_callback(struct urb *urb)
 		goto exit;
 	}
 
-	spin_lock(&dev->intr_idx_lock);
+	spin_lock_irqsave(&dev->intr_idx_lock, flags);
 	intr_idx = atomic_read(&dev->intr_idx);
 	/* aux_idx become previous intr_idx */
 	aux_idx = (intr_idx == 0) ? (MAX_INTERRUPT_BUFFER - 1) : (intr_idx - 1);
@@ -211,7 +212,7 @@ static void iowarrior_callback(struct urb *urb)
 	*(dev->read_queue + offset + (dev->report_size)) = dev->serial_number++;
 
 	atomic_set(&dev->intr_idx, aux_idx);
-	spin_unlock(&dev->intr_idx_lock);
+	spin_unlock_irqrestore(&dev->intr_idx_lock, flags);
 	/* tell the blocking read about the new data */
 	wake_up_interruptible(&dev->read_wait);
 
-- 
1.7.9.5

  parent reply	other threads:[~2013-07-11  9:05 UTC|newest]

Thread overview: 71+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-07-11  9:05 [PATCH 00/50] USB: cleanup spin_lock in URB->complete() Ming Lei
2013-07-11  9:05 ` [PATCH 01/50] USB: devio: spin_lock in complete() cleanup Ming Lei
2013-07-11  9:05 ` [PATCH 03/50] USB: usblp: " Ming Lei
2013-07-11  9:05 ` [PATCH 04/50] USB: adutux: " Ming Lei
2013-07-11  9:05 ` [PATCH 05/50] USB: misc: uss720: " Ming Lei
     [not found]   ` <1373533573-12272-6-git-send-email-ming.lei-Z7WLFzj8eWMS+FvcfC7Uqw@public.gmane.org>
2013-07-11 12:15     ` Sergei Shtylyov
2013-07-11  9:05 ` Ming Lei [this message]
2013-07-11  9:05 ` [PATCH 08/50] USB: legousbtower: " Ming Lei
     [not found]   ` <1373533573-12272-9-git-send-email-ming.lei-Z7WLFzj8eWMS+FvcfC7Uqw@public.gmane.org>
2013-07-11 12:18     ` Sergei Shtylyov
2013-07-11 12:36       ` Oliver Neukum
2013-07-11 13:47         ` Sergei Shtylyov
     [not found]       ` <51DEA289.5050509-M4DtvfQ/ZS1MRgGoP+s0PdBPR1lH4CV8@public.gmane.org>
2013-07-11 12:42         ` Ming Lei
2013-07-11  9:05 ` [PATCH 09/50] USB: usbtest: " Ming Lei
2013-07-11  9:05 ` [PATCH 10/50] USB: serial: cyberjack: " Ming Lei
2013-07-11  9:05 ` [PATCH 11/50] USB: serial: digi_acceleportldusb: " Ming Lei
2013-07-11  9:05 ` [PATCH 12/50] USB: serial: io_edgeport: " Ming Lei
2013-07-11  9:05 ` [PATCH 13/50] USB: serial: io_ti: " Ming Lei
     [not found] ` <1373533573-12272-1-git-send-email-ming.lei-Z7WLFzj8eWMS+FvcfC7Uqw@public.gmane.org>
2013-07-11  9:05   ` [PATCH 02/50] USB: cdc-wdm: " Ming Lei
2013-07-11  9:05   ` [PATCH 07/50] USB: ldusb: " Ming Lei
2013-07-11  9:05   ` [PATCH 14/50] USB: serial: mos7720: " Ming Lei
2013-07-11  9:05   ` [PATCH 20/50] USB: serial: usb_wwan: " Ming Lei
2013-07-11  9:05   ` [PATCH 26/50] USBNET: cdc-phonet: " Ming Lei
2013-07-11  9:05   ` [PATCH 27/50] USBNET: hso: " Ming Lei
2013-07-11  9:05   ` [PATCH 28/50] USBNET: kaweth: " Ming Lei
2013-07-11  9:05   ` [PATCH 29/50] USBNET: rtl8150: " Ming Lei
2013-07-11  9:06   ` [PATCH 46/50] Sound: usb: ua101: " Ming Lei
2013-07-11 13:10     ` Sergei Shtylyov
2013-07-11  9:06   ` [PATCH 47/50] staging: btmtk_usb: " Ming Lei
2013-07-11  9:05 ` [PATCH 15/50] USB: serial: mos77840: " Ming Lei
2013-07-11  9:05 ` [PATCH 16/50] USB: serial: quatech2: " Ming Lei
2013-07-11  9:05 ` [PATCH 17/50] USB: serial: sierra: " Ming Lei
2013-07-11 13:02   ` Sergei Shtylyov
2013-07-11  9:05 ` [PATCH 18/50] USB: serial: symbolserial: " Ming Lei
2013-07-11  9:05 ` [PATCH 19/50] USB: serial: ti_usb_3410_5052: " Ming Lei
2013-07-11  9:05 ` [PATCH 21/50] hid: usbhid: " Ming Lei
2013-07-11  9:05 ` [PATCH 22/50] BT: btusb: " Ming Lei
2013-07-11  9:05 ` [PATCH 23/50] BT: bfusb: read_lock " Ming Lei
2013-07-11  9:05 ` [PATCH 24/50] input: cm109: spin_lock " Ming Lei
2013-07-11  9:05 ` [PATCH 25/50] ISDN: hfcsusb: " Ming Lei
2013-07-11  9:05 ` [PATCH 30/50] wireless: ath9k: " Ming Lei
2013-07-11  9:05 ` [PATCH 31/50] wireless: zd1211rw: " Ming Lei
2013-07-11  9:05 ` [PATCH 32/50] wireless: ath: carl9170: " Ming Lei
2013-07-11  9:05 ` [PATCH 33/50] wireless: libertas: " Ming Lei
2013-07-11  9:05 ` [PATCH 34/50] wireless: libertas_tf: " Ming Lei
2013-07-11  9:05 ` [PATCH 35/50] media: usb: cx231xx: " Ming Lei
2013-07-26 14:28   ` Hans Verkuil
2013-07-27  9:34     ` Ming Lei
2013-07-11  9:05 ` [PATCH 36/50] media: usb: em28xx: " Ming Lei
2013-07-11 12:42   ` Devin Heitmueller
2013-07-11  9:06 ` [PATCH 37/50] media: usb: sn9x102: " Ming Lei
2013-07-11  9:06 ` [PATCH 38/50] media: usb: tlg2300: " Ming Lei
2013-07-11  9:06 ` [PATCH 39/50] media: usb: tm6000: " Ming Lei
2013-07-11  9:06 ` [PATCH 40/50] media: dvb-core: " Ming Lei
2013-07-11  9:06 ` [PATCH 41/50] media: usb: em28xx: make sure irq disabled before acquiring lock Ming Lei
2013-07-11  9:06 ` [PATCH 42/50] media: usb: tlg2300: spin_lock in complete() cleanup Ming Lei
2013-07-11 13:13   ` Sergei Shtylyov
2013-07-11  9:06 ` [PATCH 43/50] sound: usb: midi: " Ming Lei
2013-07-11  9:06 ` [PATCH 44/50] sound: usb: caiaq: " Ming Lei
2013-07-11 13:12   ` Sergei Shtylyov
2013-07-11 14:06   ` Daniel Mack
2013-07-11  9:06 ` [PATCH 45/50] sound: usb: usx2y: " Ming Lei
2013-07-11 13:08   ` Sergei Shtylyov
     [not found]     ` <51DEAE4E.90204-M4DtvfQ/ZS1MRgGoP+s0PdBPR1lH4CV8@public.gmane.org>
2013-07-11 13:50       ` Takashi Iwai
2013-07-11 14:13         ` Ming Lei
     [not found]           ` <CACVXFVPuv4VD_xCocP2QVOqUqAXm9gjwgwcRn6y=3qXPntOxCQ-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2013-07-11 14:34             ` Takashi Iwai
2013-07-11 14:52               ` Ming Lei
2013-07-11  9:06 ` [PATCH 48/50] staging: bcm: " Ming Lei
2013-07-11  9:06 ` [PATCH 49/50] staging: ced1401: " Ming Lei
2013-07-11  9:06 ` [PATCH 50/50] staging: vt6656: " Ming Lei
2013-07-14 13:17 ` [PATCH 00/50] USB: cleanup spin_lock in URB->complete() Andy Walls
2013-07-14 14:33   ` Ming Lei

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1373533573-12272-7-git-send-email-ming.lei@canonical.com \
    --to=ming.lei@canonical.com \
    --cc=alsa-devel@alsa-project.org \
    --cc=gregkh@linuxfoundation.org \
    --cc=linux-bluetooth@vger.kernel.org \
    --cc=linux-input@vger.kernel.org \
    --cc=linux-media@vger.kernel.org \
    --cc=linux-usb@vger.kernel.org \
    --cc=linux-wireless@vger.kernel.org \
    --cc=netdev@vger.kernel.org \
    --cc=oliver@neukum.org \
    --cc=stern@rowland.harvard.edu \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).