diff options
| author | Florian Fainelli <florian@openwrt.org> | 2012-10-08 15:11:29 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-10-22 20:23:59 +0200 |
| commit | cfa49b4b88fe14d2b5792f2ea7ba5b88c8cd1d15 (patch) | |
| tree | 5a689a1365b7b0844421ec5a18a3a9af4d28c323 /drivers/usb/host/ohci-s3c2410.c | |
| parent | USB: ohci: remove check for RH already suspended in ohci_suspend (diff) | |
| download | linux-cfa49b4b88fe14d2b5792f2ea7ba5b88c8cd1d15.tar.xz linux-cfa49b4b88fe14d2b5792f2ea7ba5b88c8cd1d15.zip | |
USB: ohci: merge ohci_finish_controller_resume with ohci_resume
Merge ohci_finish_controller_resume with ohci_resume as suggested by Alan
Stern. Since ohci_finish_controller_resume no longer exists, update the
various OHCI drivers to call ohci_resume() instead. Some drivers used to set
themselves the bit HCD_FLAG_HW_ACCESSIBLE, which is now handled by
ohci_resume().
Acked-by: Jingoo Han <jg1.han@samsung.com>
Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com>
Signed-off-by: Florian Fainelli <florian@openwrt.org>
Acked-by: Alan Stern <stern@rowland.harvard.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/usb/host/ohci-s3c2410.c')
| -rw-r--r-- | drivers/usb/host/ohci-s3c2410.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/usb/host/ohci-s3c2410.c b/drivers/usb/host/ohci-s3c2410.c index 0d2309ca471e..281d5c658e36 100644 --- a/drivers/usb/host/ohci-s3c2410.c +++ b/drivers/usb/host/ohci-s3c2410.c @@ -524,8 +524,7 @@ static int ohci_hcd_s3c2410_drv_resume(struct device *dev) s3c2410_start_hc(pdev, hcd); - set_bit(HCD_FLAG_HW_ACCESSIBLE, &hcd->flags); - ohci_finish_controller_resume(hcd); + ohci_resume(hcd, false); return 0; } |