diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-10-28 12:30:16 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-10-28 12:30:16 -0400 |
| commit | 15dbb5a3f971a28040ae6cbcd8bbdf19b629fa83 (patch) | |
| tree | e65562d7300ac653207b1e45ec7e5960ddf78fff /drivers/usb/core/hcd.c | |
| parent | be697c3f137c9ed808753bbbc5d7751c6e5303fc (diff) | |
| parent | 5fadd053d9bb4345ec6f405d24db4e7eb49cf81e (diff) | |
Merge branch 'master'
Diffstat (limited to 'drivers/usb/core/hcd.c')
| -rw-r--r-- | drivers/usb/core/hcd.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/core/hcd.c b/drivers/usb/core/hcd.c index 1017a97a418..ff19d64041b 100644 --- a/drivers/usb/core/hcd.c +++ b/drivers/usb/core/hcd.c | |||
| @@ -1112,7 +1112,7 @@ static void urb_unlink (struct urb *urb) | |||
| 1112 | * expects usb_submit_urb() to have sanity checked and conditioned all | 1112 | * expects usb_submit_urb() to have sanity checked and conditioned all |
| 1113 | * inputs in the urb | 1113 | * inputs in the urb |
| 1114 | */ | 1114 | */ |
| 1115 | static int hcd_submit_urb (struct urb *urb, unsigned mem_flags) | 1115 | static int hcd_submit_urb (struct urb *urb, gfp_t mem_flags) |
| 1116 | { | 1116 | { |
| 1117 | int status; | 1117 | int status; |
| 1118 | struct usb_hcd *hcd = urb->dev->bus->hcpriv; | 1118 | struct usb_hcd *hcd = urb->dev->bus->hcpriv; |