diff options
author | Olav Kongas <ok@artecdesign.ee> | 2005-11-25 18:58:36 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2006-01-04 16:48:35 -0500 |
commit | 717f736d937d0e98e964375dac770bfa20f73b72 (patch) | |
tree | 2aacf4fc87d275c266769022fd179c8339339cfc /drivers/usb/host/isp116x-hcd.c | |
parent | 3aea4a76a3ec4e6484f6316a97efff8b144b2b11 (diff) |
[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: Olav Kongas <ok@artecdesign.ee>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/usb/host/isp116x-hcd.c')
-rw-r--r-- | drivers/usb/host/isp116x-hcd.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/usb/host/isp116x-hcd.c b/drivers/usb/host/isp116x-hcd.c index c95af116f9e7..83447919202f 100644 --- a/drivers/usb/host/isp116x-hcd.c +++ b/drivers/usb/host/isp116x-hcd.c | |||
@@ -1426,7 +1426,6 @@ static int isp116x_bus_suspend(struct usb_hcd *hcd) | |||
1426 | val = isp116x_read_reg32(isp116x, HCCONTROL); | 1426 | val = isp116x_read_reg32(isp116x, HCCONTROL); |
1427 | switch (val & HCCONTROL_HCFS) { | 1427 | switch (val & HCCONTROL_HCFS) { |
1428 | case HCCONTROL_USB_OPER: | 1428 | case HCCONTROL_USB_OPER: |
1429 | hcd->state = HC_STATE_QUIESCING; | ||
1430 | val &= (~HCCONTROL_HCFS & ~HCCONTROL_RWE); | 1429 | val &= (~HCCONTROL_HCFS & ~HCCONTROL_RWE); |
1431 | val |= HCCONTROL_USB_SUSPEND; | 1430 | val |= HCCONTROL_USB_SUSPEND; |
1432 | if (device_may_wakeup(&hcd->self.root_hub->dev)) | 1431 | if (device_may_wakeup(&hcd->self.root_hub->dev)) |
@@ -1434,7 +1433,6 @@ static int isp116x_bus_suspend(struct usb_hcd *hcd) | |||
1434 | /* Wait for usb transfers to finish */ | 1433 | /* Wait for usb transfers to finish */ |
1435 | mdelay(2); | 1434 | mdelay(2); |
1436 | isp116x_write_reg32(isp116x, HCCONTROL, val); | 1435 | isp116x_write_reg32(isp116x, HCCONTROL, val); |
1437 | hcd->state = HC_STATE_SUSPENDED; | ||
1438 | /* Wait for devices to suspend */ | 1436 | /* Wait for devices to suspend */ |
1439 | mdelay(5); | 1437 | mdelay(5); |
1440 | case HCCONTROL_USB_SUSPEND: | 1438 | case HCCONTROL_USB_SUSPEND: |