diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-04-03 14:16:25 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-04-03 14:16:25 +0200 |
| commit | cb2e3d461b26f07540e0b898e0125137def2b015 (patch) | |
| tree | a7d3c7f79bd26b15806565405522c7c7c0da44db /drivers/usb/host/xhci-plat.c | |
| parent | d30eed1cd2b17f6140ec443f22a8e32f99cd99c1 (diff) | |
| parent | a71c9a1c779f2499fb2afc0553e543f18aff6edf (diff) | |
| download | blackbird-op-linux-cb2e3d461b26f07540e0b898e0125137def2b015.tar.gz blackbird-op-linux-cb2e3d461b26f07540e0b898e0125137def2b015.zip | |
Merge 4.11-rc5 into usb-next
We want the usb fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/usb/host/xhci-plat.c')
| -rw-r--r-- | drivers/usb/host/xhci-plat.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/usb/host/xhci-plat.c b/drivers/usb/host/xhci-plat.c index fa97826d0058..f31b9dcdaf5b 100644 --- a/drivers/usb/host/xhci-plat.c +++ b/drivers/usb/host/xhci-plat.c @@ -363,6 +363,7 @@ MODULE_DEVICE_TABLE(acpi, usb_xhci_acpi_match); static struct platform_driver usb_xhci_driver = { .probe = xhci_plat_probe, .remove = xhci_plat_remove, + .shutdown = usb_hcd_platform_shutdown, .driver = { .name = "xhci-hcd", .pm = DEV_PM_OPS, |
