diff options
author | Felipe Balbi <felipe.balbi@nokia.com> | 2009-12-04 08:47:47 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2009-12-11 14:55:28 -0500 |
commit | 8b4959d6a53b783b9f1cf1d5d9ed9f2c36440892 (patch) | |
tree | 77abf0c672c80e075118f553b6316abd8207660d /drivers/usb | |
parent | 1b6c3b0fb242309bc77092be4a283513be115735 (diff) |
USB: musb: musb_host: fix sparse warning
Fix the following sparse warning:
drivers/usb/musb/musb_host.c:1642:9: warning: symbol 'status' shadows an earlier one
Signed-off-by: Felipe Balbi <felipe.balbi@nokia.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/usb')
-rw-r--r-- | drivers/usb/musb/musb_host.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/usb/musb/musb_host.c b/drivers/usb/musb/musb_host.c index e3ab40a966eb..74c4c3698f1e 100644 --- a/drivers/usb/musb/musb_host.c +++ b/drivers/usb/musb/musb_host.c | |||
@@ -1642,18 +1642,18 @@ void musb_host_rx(struct musb *musb, u8 epnum) | |||
1642 | c = musb->dma_controller; | 1642 | c = musb->dma_controller; |
1643 | 1643 | ||
1644 | if (usb_pipeisoc(pipe)) { | 1644 | if (usb_pipeisoc(pipe)) { |
1645 | int status = 0; | 1645 | int d_status = 0; |
1646 | struct usb_iso_packet_descriptor *d; | 1646 | struct usb_iso_packet_descriptor *d; |
1647 | 1647 | ||
1648 | d = urb->iso_frame_desc + qh->iso_idx; | 1648 | d = urb->iso_frame_desc + qh->iso_idx; |
1649 | 1649 | ||
1650 | if (iso_err) { | 1650 | if (iso_err) { |
1651 | status = -EILSEQ; | 1651 | d_status = -EILSEQ; |
1652 | urb->error_count++; | 1652 | urb->error_count++; |
1653 | } | 1653 | } |
1654 | if (rx_count > d->length) { | 1654 | if (rx_count > d->length) { |
1655 | if (status == 0) { | 1655 | if (d_status == 0) { |
1656 | status = -EOVERFLOW; | 1656 | d_status = -EOVERFLOW; |
1657 | urb->error_count++; | 1657 | urb->error_count++; |
1658 | } | 1658 | } |
1659 | DBG(2, "** OVERFLOW %d into %d\n",\ | 1659 | DBG(2, "** OVERFLOW %d into %d\n",\ |
@@ -1662,7 +1662,7 @@ void musb_host_rx(struct musb *musb, u8 epnum) | |||
1662 | length = d->length; | 1662 | length = d->length; |
1663 | } else | 1663 | } else |
1664 | length = rx_count; | 1664 | length = rx_count; |
1665 | d->status = status; | 1665 | d->status = d_status; |
1666 | buf = urb->transfer_dma + d->offset; | 1666 | buf = urb->transfer_dma + d->offset; |
1667 | } else { | 1667 | } else { |
1668 | length = rx_count; | 1668 | length = rx_count; |