diff options
Diffstat (limited to 'drivers/usb')
-rw-r--r-- | drivers/usb/gadget/net2280.c | 2 | ||||
-rw-r--r-- | drivers/usb/host/ehci-pci.c | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/drivers/usb/gadget/net2280.c b/drivers/usb/gadget/net2280.c index d975ecf18e00..00fda334dc72 100644 --- a/drivers/usb/gadget/net2280.c +++ b/drivers/usb/gadget/net2280.c | |||
@@ -2964,7 +2964,7 @@ static int net2280_probe (struct pci_dev *pdev, const struct pci_device_id *id) | |||
2964 | , &dev->pci->pcimstctl); | 2964 | , &dev->pci->pcimstctl); |
2965 | /* erratum 0115 shouldn't appear: Linux inits PCI_LATENCY_TIMER */ | 2965 | /* erratum 0115 shouldn't appear: Linux inits PCI_LATENCY_TIMER */ |
2966 | pci_set_master (pdev); | 2966 | pci_set_master (pdev); |
2967 | pci_set_mwi (pdev); | 2967 | pci_try_set_mwi (pdev); |
2968 | 2968 | ||
2969 | /* ... also flushes any posted pci writes */ | 2969 | /* ... also flushes any posted pci writes */ |
2970 | dev->chiprev = get_idx_reg (dev->regs, REG_CHIPREV) & 0xffff; | 2970 | dev->chiprev = get_idx_reg (dev->regs, REG_CHIPREV) & 0xffff; |
diff --git a/drivers/usb/host/ehci-pci.c b/drivers/usb/host/ehci-pci.c index 12edc723ec73..966965f72338 100644 --- a/drivers/usb/host/ehci-pci.c +++ b/drivers/usb/host/ehci-pci.c | |||
@@ -149,8 +149,7 @@ static int ehci_pci_setup(struct usb_hcd *hcd) | |||
149 | * fixed in newer silicon. | 149 | * fixed in newer silicon. |
150 | */ | 150 | */ |
151 | case 0x0068: | 151 | case 0x0068: |
152 | pci_read_config_dword(pdev, PCI_REVISION_ID, &temp); | 152 | if (pdev->revision < 0xa4) |
153 | if ((temp & 0xff) < 0xa4) | ||
154 | ehci->no_selective_suspend = 1; | 153 | ehci->no_selective_suspend = 1; |
155 | break; | 154 | break; |
156 | } | 155 | } |