diff options
| author | Oliver Neukum <oliver@neukum.org> | 2009-08-26 19:56:12 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2009-10-05 09:32:01 -0700 |
| commit | 68eeb516062536e6877a5e0dc890235157dfe745 (patch) | |
| tree | 3c56b745072a467865ace6c851ef05a99f6521f0 | |
| parent | 6e1a0b2d05b1aac43a223dbbe893c2ca330a3a73 (diff) | |
| download | linux-jz47xx-68eeb516062536e6877a5e0dc890235157dfe745.tar.gz | |
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 <oliver@neukum.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| -rw-r--r-- | drivers/usb/storage/onetouch.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/storage/onetouch.c b/drivers/usb/storage/onetouch.c index 380233bd6a3..80e65f29921 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; |