aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/usb/storage
diff options
context:
space:
mode:
authorOliver Neukum <oliver@neukum.org>2009-08-26 13:56:12 -0400
committerGreg Kroah-Hartman <gregkh@suse.de>2009-09-23 09:46:15 -0400
commite5dc8ae121592239c2a2521d383bcb789849b2a3 (patch)
treef2a31bfba0fe83c9075dd4ee74197c1f9ee7b0a7 /drivers/usb/storage
parent7fa07729e439a6184bd824746d06a49cca553f15 (diff)
USB: storage: fix a resume path GFP_NOIO must be used
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 <oliver@neukum.org> Cc: stable <stable@kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/usb/storage')
-rw-r--r--drivers/usb/storage/onetouch.c2
1 files changed, 1 insertions, 1 deletions
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)
163 usb_kill_urb(onetouch->irq); 163 usb_kill_urb(onetouch->irq);
164 break; 164 break;
165 case US_RESUME: 165 case US_RESUME:
166 if (usb_submit_urb(onetouch->irq, GFP_KERNEL) != 0) 166 if (usb_submit_urb(onetouch->irq, GFP_NOIO) != 0)
167 dev_err(&onetouch->irq->dev->dev, 167 dev_err(&onetouch->irq->dev->dev,
168 "usb_submit_urb failed\n"); 168 "usb_submit_urb failed\n");
169 break; 169 break;