Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Input: cm109 - spin_lock in complete() cleanup

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

Signed-off-by: Ming Lei <ming.lei@canonical.com>
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
This commit is contained in:
Ming Lei 2016-05-02 11:15:01 -07:00 committed by Dmitry Torokhov
parent c90a0f08fe
commit d144cf42ee
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
drivers/input/misc/cm109.c
View file

@ -366,6 +366,7 @@ static void cm109_urb_irq_callback(struct urb *urb)
struct cm109_dev *dev = urb->context; struct cm109_dev *dev = urb->context;
const int status = urb->status; const int status = urb->status;
int error; 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_dbg(&dev->intf->dev, "### URB IRQ: [0x%02x 0x%02x 0x%02x 0x%02x] keybit=0x%02x\n",
dev->irq_data->byte[0], dev->irq_data->byte[0],
@ -404,7 +405,7 @@ static void cm109_urb_irq_callback(struct urb *urb)
out: out:
spin_lock(&dev->ctl_submit_lock); spin_lock_irqsave(&dev->ctl_submit_lock, flags);
dev->irq_urb_pending = 0; dev->irq_urb_pending = 0;
@ -428,7 +429,7 @@ static void cm109_urb_irq_callback(struct urb *urb)
__func__, error); __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) static void cm109_urb_ctl_callback(struct urb *urb)
@ -436,6 +437,7 @@ static void cm109_urb_ctl_callback(struct urb *urb)
struct cm109_dev *dev = urb->context; struct cm109_dev *dev = urb->context;
const int status = urb->status; const int status = urb->status;
int error; int error;
unsigned long flags;
dev_dbg(&dev->intf->dev, "### URB CTL: [0x%02x 0x%02x 0x%02x 0x%02x]\n", dev_dbg(&dev->intf->dev, "### URB CTL: [0x%02x 0x%02x 0x%02x 0x%02x]\n",
dev->ctl_data->byte[0], dev->ctl_data->byte[0],
@ -450,7 +452,7 @@ static void cm109_urb_ctl_callback(struct urb *urb)
__func__, status); __func__, status);
} }
spin_lock(&dev->ctl_submit_lock); spin_lock_irqsave(&dev->ctl_submit_lock, flags);
dev->ctl_urb_pending = 0; dev->ctl_urb_pending = 0;
@ -471,7 +473,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) static void cm109_toggle_buzzer_async(struct cm109_dev *dev)