[PATCH] USB: isp116x-hcd: minor cleanup
authorOlav Kongas <ok@artecdesign.ee>
Fri, 25 Nov 2005 23:58:36 +0000 (01:58 +0200)
committerGreg Kroah-Hartman <gregkh@suse.de>
Wed, 4 Jan 2006 21:48:35 +0000 (13:48 -0800)
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>
drivers/usb/host/isp116x-hcd.c

index c95af116f9e7c434021c7d9fd4c5fd39c0e53399..83447919202fcb2d61533f5a0e82dec0c1ece94c 100644 (file)
@@ -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: