summaryrefslogtreecommitdiff
path: root/drivers/usb
diff options
context:
space:
mode:
authorOlav Kongas <ok@artecdesign.ee>2005-11-25 23:58:36 (GMT)
committerGreg Kroah-Hartman <gregkh@suse.de>2006-01-04 21:48:35 (GMT)
commit717f736d937d0e98e964375dac770bfa20f73b72 (patch)
tree2aacf4fc87d275c266769022fd179c8339339cfc /drivers/usb
parent3aea4a76a3ec4e6484f6316a97efff8b144b2b11 (diff)
downloadlinux-717f736d937d0e98e964375dac770bfa20f73b72.tar.xz
[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')
-rw-r--r--drivers/usb/host/isp116x-hcd.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/usb/host/isp116x-hcd.c b/drivers/usb/host/isp116x-hcd.c
index c95af11..8344791 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)
val = isp116x_read_reg32(isp116x, HCCONTROL);
switch (val & HCCONTROL_HCFS) {
case HCCONTROL_USB_OPER:
- hcd->state = HC_STATE_QUIESCING;
val &= (~HCCONTROL_HCFS & ~HCCONTROL_RWE);
val |= HCCONTROL_USB_SUSPEND;
if (device_may_wakeup(&hcd->self.root_hub->dev))
@@ -1434,7 +1433,6 @@ static int isp116x_bus_suspend(struct usb_hcd *hcd)
/* Wait for usb transfers to finish */
mdelay(2);
isp116x_write_reg32(isp116x, HCCONTROL, val);
- hcd->state = HC_STATE_SUSPENDED;
/* Wait for devices to suspend */
mdelay(5);
case HCCONTROL_USB_SUSPEND: