diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2012-08-01 06:49:13 +0200 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2012-08-01 06:49:13 +0200 |
| commit | 91ba548cfd5cc8ee93b9435527efb8fa4caf5c5e (patch) | |
| tree | c96ed92413044a28d17783e84a8824bfd2437af1 /drivers/net/usb/kaweth.c | |
| parent | sh: modify the sh_dmae_slave_config for RSPI in setup-sh7757 (diff) | |
| parent | serial: sh-sci: fix compilation breakage, when DMA is enabled (diff) | |
| download | linux-91ba548cfd5cc8ee93b9435527efb8fa4caf5c5e.tar.xz linux-91ba548cfd5cc8ee93b9435527efb8fa4caf5c5e.zip | |
Merge branch 'sh/dmaengine' into sh-latest
Diffstat (limited to 'drivers/net/usb/kaweth.c')
| -rw-r--r-- | drivers/net/usb/kaweth.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/usb/kaweth.c b/drivers/net/usb/kaweth.c index d8ad55284389..c3d03490c97d 100644 --- a/drivers/net/usb/kaweth.c +++ b/drivers/net/usb/kaweth.c @@ -1314,7 +1314,7 @@ static int kaweth_internal_control_msg(struct usb_device *usb_dev, int retv; int length = 0; /* shut up GCC */ - urb = usb_alloc_urb(0, GFP_NOIO); + urb = usb_alloc_urb(0, GFP_ATOMIC); if (!urb) return -ENOMEM; |