summaryrefslogtreecommitdiff
path: root/ANDROID_3.4.5/drivers/usb/host/pci-quirks.c
diff options
context:
space:
mode:
Diffstat (limited to 'ANDROID_3.4.5/drivers/usb/host/pci-quirks.c')
-rw-r--r--ANDROID_3.4.5/drivers/usb/host/pci-quirks.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/ANDROID_3.4.5/drivers/usb/host/pci-quirks.c b/ANDROID_3.4.5/drivers/usb/host/pci-quirks.c
index df0828cb..2efade76 100644
--- a/ANDROID_3.4.5/drivers/usb/host/pci-quirks.c
+++ b/ANDROID_3.4.5/drivers/usb/host/pci-quirks.c
@@ -389,7 +389,7 @@ EXPORT_SYMBOL_GPL(uhci_reset_hc);
*/
int uhci_check_and_reset_hc(struct pci_dev *pdev, unsigned long base)
{
- u16 legsup;
+ //u16 legsup;
unsigned int cmd, intr;
/*
@@ -402,16 +402,19 @@ int uhci_check_and_reset_hc(struct pci_dev *pdev, unsigned long base)
*
* If any of these conditions are violated we do a complete reset.
*/
+ #if 0
pci_read_config_word(pdev, UHCI_USBLEGSUP, &legsup);
if (legsup & ~(UHCI_USBLEGSUP_RO | UHCI_USBLEGSUP_RWC)) {
dev_dbg(&pdev->dev, "%s: legsup = 0x%04x\n",
__func__, legsup);
goto reset_needed;
}
+ #endif
cmd = inw(base + UHCI_USBCMD);
- if ((cmd & UHCI_USBCMD_RUN) || !(cmd & UHCI_USBCMD_CONFIGURE) ||
- !(cmd & UHCI_USBCMD_EGSM)) {
+// if ((cmd & UHCI_USBCMD_RUN) || !(cmd & UHCI_USBCMD_CONFIGURE) ||
+// !(cmd & UHCI_USBCMD_EGSM)) {
+ if ((cmd & UHCI_USBCMD_RUN) || !(cmd & UHCI_USBCMD_EGSM)) {
dev_dbg(&pdev->dev, "%s: cmd = 0x%04x\n",
__func__, cmd);
goto reset_needed;