diff options
author | Thomas Pugliese <thomas.pugliese@gmail.com> | 2013-11-25 17:17:17 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-12-08 20:54:15 -0500 |
commit | bbfc34201fffd8a41c2ecbad2b8fb3bf00d7ee74 (patch) | |
tree | f54b68980360c434bc61f9de16505594552ab0f4 /drivers/usb | |
parent | b374487ebe8a91d03c07fe361af375e09285c3b0 (diff) |
usb: wusbcore: add more info to debug prints in urb_unlink path
Add more info to debug prints in urb_unlink path
Signed-off-by: Thomas Pugliese <thomas.pugliese@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/usb')
-rw-r--r-- | drivers/usb/wusbcore/wa-xfer.c | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/drivers/usb/wusbcore/wa-xfer.c b/drivers/usb/wusbcore/wa-xfer.c index 5957e486591a..3220c62de317 100644 --- a/drivers/usb/wusbcore/wa-xfer.c +++ b/drivers/usb/wusbcore/wa-xfer.c | |||
@@ -373,10 +373,10 @@ static unsigned __wa_xfer_is_done(struct wa_xfer *xfer) | |||
373 | seg->result); | 373 | seg->result); |
374 | goto out; | 374 | goto out; |
375 | case WA_SEG_ABORTED: | 375 | case WA_SEG_ABORTED: |
376 | dev_dbg(dev, "xfer %p ID %08X#%u ABORTED: result %d\n", | 376 | xfer->result = seg->result; |
377 | xfer, wa_xfer_id(xfer), seg->index, | 377 | dev_dbg(dev, "xfer %p ID %08X#%u: ABORTED result %zu(0x%08zX)\n", |
378 | urb->status); | 378 | xfer, wa_xfer_id(xfer), seg->index, seg->result, |
379 | xfer->result = urb->status; | 379 | seg->result); |
380 | goto out; | 380 | goto out; |
381 | default: | 381 | default: |
382 | dev_warn(dev, "xfer %p ID %08X#%u: is_done bad state %d\n", | 382 | dev_warn(dev, "xfer %p ID %08X#%u: is_done bad state %d\n", |
@@ -1568,7 +1568,8 @@ static int wa_urb_enqueue_b(struct wa_xfer *xfer) | |||
1568 | wusb_dev = __wusb_dev_get_by_usb_dev(wusbhc, urb->dev); | 1568 | wusb_dev = __wusb_dev_get_by_usb_dev(wusbhc, urb->dev); |
1569 | if (wusb_dev == NULL) { | 1569 | if (wusb_dev == NULL) { |
1570 | mutex_unlock(&wusbhc->mutex); | 1570 | mutex_unlock(&wusbhc->mutex); |
1571 | pr_err("%s: error wusb dev gone\n", __func__); | 1571 | dev_err(&(urb->dev->dev), "%s: error wusb dev gone\n", |
1572 | __func__); | ||
1572 | goto error_dev_gone; | 1573 | goto error_dev_gone; |
1573 | } | 1574 | } |
1574 | mutex_unlock(&wusbhc->mutex); | 1575 | mutex_unlock(&wusbhc->mutex); |
@@ -1577,18 +1578,18 @@ static int wa_urb_enqueue_b(struct wa_xfer *xfer) | |||
1577 | xfer->wusb_dev = wusb_dev; | 1578 | xfer->wusb_dev = wusb_dev; |
1578 | result = urb->status; | 1579 | result = urb->status; |
1579 | if (urb->status != -EINPROGRESS) { | 1580 | if (urb->status != -EINPROGRESS) { |
1580 | pr_err("%s: error_dequeued\n", __func__); | 1581 | dev_err(&(urb->dev->dev), "%s: error_dequeued\n", __func__); |
1581 | goto error_dequeued; | 1582 | goto error_dequeued; |
1582 | } | 1583 | } |
1583 | 1584 | ||
1584 | result = __wa_xfer_setup(xfer, urb); | 1585 | result = __wa_xfer_setup(xfer, urb); |
1585 | if (result < 0) { | 1586 | if (result < 0) { |
1586 | pr_err("%s: error_xfer_setup\n", __func__); | 1587 | dev_err(&(urb->dev->dev), "%s: error_xfer_setup\n", __func__); |
1587 | goto error_xfer_setup; | 1588 | goto error_xfer_setup; |
1588 | } | 1589 | } |
1589 | result = __wa_xfer_submit(xfer); | 1590 | result = __wa_xfer_submit(xfer); |
1590 | if (result < 0) { | 1591 | if (result < 0) { |
1591 | pr_err("%s: error_xfer_submit\n", __func__); | 1592 | dev_err(&(urb->dev->dev), "%s: error_xfer_submit\n", __func__); |
1592 | goto error_xfer_submit; | 1593 | goto error_xfer_submit; |
1593 | } | 1594 | } |
1594 | spin_unlock_irqrestore(&xfer->lock, flags); | 1595 | spin_unlock_irqrestore(&xfer->lock, flags); |
@@ -1844,8 +1845,8 @@ int wa_urb_dequeue(struct wahc *wa, struct urb *urb, int status) | |||
1844 | pr_debug("%s: DEQUEUE xfer id 0x%08X\n", __func__, wa_xfer_id(xfer)); | 1845 | pr_debug("%s: DEQUEUE xfer id 0x%08X\n", __func__, wa_xfer_id(xfer)); |
1845 | rpipe = xfer->ep->hcpriv; | 1846 | rpipe = xfer->ep->hcpriv; |
1846 | if (rpipe == NULL) { | 1847 | if (rpipe == NULL) { |
1847 | pr_debug("%s: xfer id 0x%08X has no RPIPE. %s", | 1848 | pr_debug("%s: xfer %p id 0x%08X has no RPIPE. %s", |
1848 | __func__, wa_xfer_id(xfer), | 1849 | __func__, xfer, wa_xfer_id(xfer), |
1849 | "Probably already aborted.\n" ); | 1850 | "Probably already aborted.\n" ); |
1850 | goto out_unlock; | 1851 | goto out_unlock; |
1851 | } | 1852 | } |