From: Olav Kongas Date: Fri, 25 Nov 2005 23:58:36 +0000 (+0200) Subject: [PATCH] USB: isp116x-hcd: minor cleanup X-Git-Tag: v2.6.16-rc1~474^2~22^2~10^2~43 X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=717f736d937d0e98e964375dac770bfa20f73b72;p=~emulex%2Finfiniband.git [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 Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/usb/host/isp116x-hcd.c b/drivers/usb/host/isp116x-hcd.c index c95af116f9e..83447919202 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: