diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2018-10-23 13:19:54 +0200 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2018-10-23 13:19:54 +0200 |
| commit | a600ffe6ec609b0600ec590236f97f8d430e0984 (patch) | |
| tree | 57432877c74c80ab470d7b655a2e18a6b5168ee5 /drivers/usb/core/hcd-pci.c | |
| parent | d19031d32cd77b2878a006040e0f8e4183ca59ef (diff) | |
| parent | 23e542e5ba5e4298a1475f94750317ec1662ba21 (diff) | |
| download | talos-obmc-linux-a600ffe6ec609b0600ec590236f97f8d430e0984.tar.gz talos-obmc-linux-a600ffe6ec609b0600ec590236f97f8d430e0984.zip | |
Merge branch 'for-4.20/google' into for-linus
Whisker device specific fixes to hid-google driver
Diffstat (limited to 'drivers/usb/core/hcd-pci.c')
| -rw-r--r-- | drivers/usb/core/hcd-pci.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/usb/core/hcd-pci.c b/drivers/usb/core/hcd-pci.c index 66fe1b78d952..03432467b05f 100644 --- a/drivers/usb/core/hcd-pci.c +++ b/drivers/usb/core/hcd-pci.c @@ -515,8 +515,6 @@ static int resume_common(struct device *dev, int event) event == PM_EVENT_RESTORE); if (retval) { dev_err(dev, "PCI post-resume error %d!\n", retval); - if (hcd->shared_hcd) - usb_hc_died(hcd->shared_hcd); usb_hc_died(hcd); } } |
