diff options
Diffstat (limited to 'drivers/usb/core/hcd.c')
-rw-r--r-- | drivers/usb/core/hcd.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/usb/core/hcd.c b/drivers/usb/core/hcd.c index 49550790a3cb..5dea98358c05 100644 --- a/drivers/usb/core/hcd.c +++ b/drivers/usb/core/hcd.c | |||
@@ -1723,7 +1723,7 @@ int usb_hcd_unlink_urb (struct urb *urb, int status) | |||
1723 | if (retval == 0) | 1723 | if (retval == 0) |
1724 | retval = -EINPROGRESS; | 1724 | retval = -EINPROGRESS; |
1725 | else if (retval != -EIDRM && retval != -EBUSY) | 1725 | else if (retval != -EIDRM && retval != -EBUSY) |
1726 | dev_dbg(&udev->dev, "hcd_unlink_urb %p fail %d\n", | 1726 | dev_dbg(&udev->dev, "hcd_unlink_urb %pK fail %d\n", |
1727 | urb, retval); | 1727 | urb, retval); |
1728 | usb_put_dev(udev); | 1728 | usb_put_dev(udev); |
1729 | } | 1729 | } |
@@ -1890,7 +1890,7 @@ rescan: | |||
1890 | /* kick hcd */ | 1890 | /* kick hcd */ |
1891 | unlink1(hcd, urb, -ESHUTDOWN); | 1891 | unlink1(hcd, urb, -ESHUTDOWN); |
1892 | dev_dbg (hcd->self.controller, | 1892 | dev_dbg (hcd->self.controller, |
1893 | "shutdown urb %p ep%d%s%s\n", | 1893 | "shutdown urb %pK ep%d%s%s\n", |
1894 | urb, usb_endpoint_num(&ep->desc), | 1894 | urb, usb_endpoint_num(&ep->desc), |
1895 | is_in ? "in" : "out", | 1895 | is_in ? "in" : "out", |
1896 | ({ char *s; | 1896 | ({ char *s; |
@@ -2520,6 +2520,7 @@ struct usb_hcd *__usb_create_hcd(const struct hc_driver *driver, | |||
2520 | hcd->bandwidth_mutex = kmalloc(sizeof(*hcd->bandwidth_mutex), | 2520 | hcd->bandwidth_mutex = kmalloc(sizeof(*hcd->bandwidth_mutex), |
2521 | GFP_KERNEL); | 2521 | GFP_KERNEL); |
2522 | if (!hcd->bandwidth_mutex) { | 2522 | if (!hcd->bandwidth_mutex) { |
2523 | kfree(hcd->address0_mutex); | ||
2523 | kfree(hcd); | 2524 | kfree(hcd); |
2524 | dev_dbg(dev, "hcd bandwidth mutex alloc failed\n"); | 2525 | dev_dbg(dev, "hcd bandwidth mutex alloc failed\n"); |
2525 | return NULL; | 2526 | return NULL; |