diff options
| author | Jens Axboe <jens.axboe@oracle.com> | 2010-02-22 07:48:51 -0500 |
|---|---|---|
| committer | Jens Axboe <jens.axboe@oracle.com> | 2010-02-22 07:48:51 -0500 |
| commit | f11cbd74c5ff3614f6390b4de67a6ffdc614c378 (patch) | |
| tree | 6a30920ade9eeaac5bf6d6263b5d09712e882eb0 /drivers/usb/core/devices.c | |
| parent | 429c42c9d246f5bda868495c09974312a0177328 (diff) | |
| parent | aea187c46f7d03ce985e55eb1398d0776a15b928 (diff) | |
Merge branch 'master' into for-2.6.34
Diffstat (limited to 'drivers/usb/core/devices.c')
| -rw-r--r-- | drivers/usb/core/devices.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/core/devices.c b/drivers/usb/core/devices.c index 96f11715cd2..355dffcc23b 100644 --- a/drivers/usb/core/devices.c +++ b/drivers/usb/core/devices.c | |||
| @@ -494,7 +494,7 @@ static ssize_t usb_device_dump(char __user **buffer, size_t *nbytes, | |||
| 494 | return 0; | 494 | return 0; |
| 495 | /* allocate 2^1 pages = 8K (on i386); | 495 | /* allocate 2^1 pages = 8K (on i386); |
| 496 | * should be more than enough for one device */ | 496 | * should be more than enough for one device */ |
| 497 | pages_start = (char *)__get_free_pages(GFP_KERNEL, 1); | 497 | pages_start = (char *)__get_free_pages(GFP_NOIO, 1); |
| 498 | if (!pages_start) | 498 | if (!pages_start) |
| 499 | return -ENOMEM; | 499 | return -ENOMEM; |
| 500 | 500 | ||