diff options
author | Alex Shi <alex.shi@linaro.org> | 2014-06-09 12:55:42 +0800 |
---|---|---|
committer | Alex Shi <alex.shi@linaro.org> | 2014-06-09 12:55:42 +0800 |
commit | 3b8d7f4db34913c8e2ea0177723784b646f7424e (patch) | |
tree | 1c28a8a8c273dffd031935f5ee509db5c5e0f386 /drivers/usb/host/ohci-pci.c | |
parent | f669f023e2ce45ab6e289bd980d435e1dae0e362 (diff) | |
parent | c2f7eb8029e23c4f5445340d8fc0d05367538e6d (diff) |
Merge tag v3.10.42 into linux-linaro-lsk
This is the 3.10.42 stable release
Diffstat (limited to 'drivers/usb/host/ohci-pci.c')
-rw-r--r-- | drivers/usb/host/ohci-pci.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/usb/host/ohci-pci.c b/drivers/usb/host/ohci-pci.c index ef6782bd1fa9..67af8eef6537 100644 --- a/drivers/usb/host/ohci-pci.c +++ b/drivers/usb/host/ohci-pci.c @@ -172,6 +172,7 @@ static int ohci_quirk_amd700(struct usb_hcd *hcd) pci_dev_put(amd_smbus_dev); amd_smbus_dev = NULL; + ohci->flags |= OHCI_QUIRK_GLOBAL_SUSPEND; return 0; } |