Title: [7907] trunk/drivers/usb/musb: task[#5199]disabling ping doesn't make sense,so roll back
- Revision
- 7907
- Author
- cliff
- Date
- 2009-12-02 04:59:14 -0500 (Wed, 02 Dec 2009)
Log Message
task[#5199]disabling ping doesn't make sense,so roll back
Modified Paths
Diff
Modified: trunk/drivers/usb/musb/musb_core.c (7906 => 7907)
--- trunk/drivers/usb/musb/musb_core.c 2009-12-02 09:13:36 UTC (rev 7906)
+++ trunk/drivers/usb/musb/musb_core.c 2009-12-02 09:59:14 UTC (rev 7907)
@@ -563,7 +563,6 @@
handled = IRQ_HANDLED;
musb->is_active = 1;
set_bit(HCD_FLAG_SAW_IRQ, &hcd->flags);
- musb->disable_ping = 0;
musb->ep0_stage = MUSB_EP0_START;
Modified: trunk/drivers/usb/musb/musb_core.h (7906 => 7907)
--- trunk/drivers/usb/musb/musb_core.h 2009-12-02 09:13:36 UTC (rev 7906)
+++ trunk/drivers/usb/musb/musb_core.h 2009-12-02 09:59:14 UTC (rev 7907)
@@ -404,9 +404,6 @@
unsigned hb_iso_rx:1; /* high bandwidth iso rx? */
unsigned hb_iso_tx:1; /* high bandwidth iso tx? */
- /* Disable PING packet to cope with ill-behaved usb thumb drives. */
- unsigned disable_ping:1;
-
#ifdef C_MP_TX
unsigned bulk_split:1;
#define can_bulk_split(musb,type) \
Modified: trunk/drivers/usb/musb/musb_host.c (7906 => 7907)
--- trunk/drivers/usb/musb/musb_host.c 2009-12-02 09:13:36 UTC (rev 7906)
+++ trunk/drivers/usb/musb/musb_host.c 2009-12-02 09:59:14 UTC (rev 7907)
@@ -1013,11 +1013,6 @@
} else if (csr & MUSB_CSR0_H_NAKTIMEOUT) {
DBG(2, "control NAK timeout\n");
- /* For some ill-behaved USB stick, control transfer should
- * disable PING packet
- */
- musb->disable_ping = 1;
-
/* NOTE: this code path would be a good place to PAUSE a
* control transfer, if another one is queued, so that
* ep0 is more likely to stay busy. That's already done
@@ -1077,8 +1072,6 @@
else
csr = MUSB_CSR0_H_STATUSPKT
| MUSB_CSR0_TXPKTRDY;
- if (musb->disable_ping)
- csr |= MUSB_CSR0_H_DIS_PING;
/* flag status stage */
musb->ep0_stage = MUSB_EP0_STATUS;
@@ -1987,11 +1980,6 @@
/* ISO always uses logarithmic encoding */
interval = min_t(u8, epd->bInterval, 16);
break;
- case USB_ENDPOINT_XFER_CONTROL:
- if (!musb->disable_ping) {
- interval = (USB_SPEED_HIGH == urb->dev->speed) ? 8 : 0;
- break;
- }
default:
/* REVISIT we actually want to use NAK limits, hinting to the
* transfer scheduling logic to try some other qh, e.g. try
_______________________________________________
Linux-kernel-commits mailing list
[email protected]
https://blackfin.uclinux.org/mailman/listinfo/linux-kernel-commits
