Commit 717f736d authored by Olav Kongas's avatar Olav Kongas Committed by Greg Kroah-Hartman

[PATCH] USB: isp116x-hcd: minor cleanup

When going to suspend, there's no point in setting HC state in
host controller driver as USB core takes care of this.
Signed-off-by: default avatarOlav Kongas <ok@artecdesign.ee>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 3aea4a76
...@@ -1426,7 +1426,6 @@ static int isp116x_bus_suspend(struct usb_hcd *hcd) ...@@ -1426,7 +1426,6 @@ static int isp116x_bus_suspend(struct usb_hcd *hcd)
val = isp116x_read_reg32(isp116x, HCCONTROL); val = isp116x_read_reg32(isp116x, HCCONTROL);
switch (val & HCCONTROL_HCFS) { switch (val & HCCONTROL_HCFS) {
case HCCONTROL_USB_OPER: case HCCONTROL_USB_OPER:
hcd->state = HC_STATE_QUIESCING;
val &= (~HCCONTROL_HCFS & ~HCCONTROL_RWE); val &= (~HCCONTROL_HCFS & ~HCCONTROL_RWE);
val |= HCCONTROL_USB_SUSPEND; val |= HCCONTROL_USB_SUSPEND;
if (device_may_wakeup(&hcd->self.root_hub->dev)) if (device_may_wakeup(&hcd->self.root_hub->dev))
...@@ -1434,7 +1433,6 @@ static int isp116x_bus_suspend(struct usb_hcd *hcd) ...@@ -1434,7 +1433,6 @@ static int isp116x_bus_suspend(struct usb_hcd *hcd)
/* Wait for usb transfers to finish */ /* Wait for usb transfers to finish */
mdelay(2); mdelay(2);
isp116x_write_reg32(isp116x, HCCONTROL, val); isp116x_write_reg32(isp116x, HCCONTROL, val);
hcd->state = HC_STATE_SUSPENDED;
/* Wait for devices to suspend */ /* Wait for devices to suspend */
mdelay(5); mdelay(5);
case HCCONTROL_USB_SUSPEND: case HCCONTROL_USB_SUSPEND:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment