git.ipfire.org Git - thirdparty/kernel/stable-queue.git/blob

   1 From e871db8d78df1c411032cbb3acfdf8930509360e Mon Sep 17 00:00:00 2001
   2 From: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
   3 Date: Tue, 11 Sep 2018 10:00:44 +0200
   4 Subject: Revert "usb: cdc-wdm: Fix a sleep-in-atomic-context bug in service_outstanding_interrupt()"
   5
   6 From: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
   7
   8 commit e871db8d78df1c411032cbb3acfdf8930509360e upstream.
   9
  10 This reverts commit 6e22e3af7bb3a7b9dc53cb4687659f6e63fca427.
  11
  12 The bug the patch describes to, has been already fixed in commit
  13 2df6948428542 ("USB: cdc-wdm: don't enable interrupts in USB-giveback")
  14 so need to this, revert it.
  15
  16 Fixes: 6e22e3af7bb3 ("usb: cdc-wdm: Fix a sleep-in-atomic-context bug in service_outstanding_interrupt()")
  17 Cc: stable <stable@vger.kernel.org>
  18 Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
  19 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  20
  21 ---
  22  drivers/usb/class/cdc-wdm.c |    2 +-
  23  1 file changed, 1 insertion(+), 1 deletion(-)
  24
  25 --- a/drivers/usb/class/cdc-wdm.c
  26 +++ b/drivers/usb/class/cdc-wdm.c
  27 @@ -470,7 +470,7 @@ static int service_outstanding_interrupt
  28
  29         set_bit(WDM_RESPONDING, &desc->flags);
  30         spin_unlock_irq(&desc->iuspin);
  31 -       rv = usb_submit_urb(desc->response, GFP_ATOMIC);
  32 +       rv = usb_submit_urb(desc->response, GFP_KERNEL);
  33         spin_lock_irq(&desc->iuspin);
  34         if (rv) {
  35                 dev_err(&desc->intf->dev,