From: Oliver Neukum Date: Wed, 26 Aug 2009 17:56:12 +0000 (+0200) Subject: USB: storage: fix a resume path GFP_NOIO must be used X-Git-Tag: v2.6.31.2~86 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=68eeb516062536e6877a5e0dc890235157dfe745;p=karo-tx-linux.git USB: storage: fix a resume path GFP_NOIO must be used commit e5dc8ae121592239c2a2521d383bcb789849b2a3 upstream. In the resume path of a block driver GFP_NOIO must be used to avoid a possible deadlock. The onetouch subdriver of storage violates the requirement. Signed-off-by: Oliver Neukum Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/usb/storage/onetouch.c b/drivers/usb/storage/onetouch.c index 380233bd6a39..80e65f29921c 100644 --- a/drivers/usb/storage/onetouch.c +++ b/drivers/usb/storage/onetouch.c @@ -163,7 +163,7 @@ static void usb_onetouch_pm_hook(struct us_data *us, int action) usb_kill_urb(onetouch->irq); break; case US_RESUME: - if (usb_submit_urb(onetouch->irq, GFP_KERNEL) != 0) + if (usb_submit_urb(onetouch->irq, GFP_NOIO) != 0) dev_err(&onetouch->irq->dev->dev, "usb_submit_urb failed\n"); break;