From: David Brownell <david-b@pacbell.net>
Date: Mon, 7 Nov 2005 23:38:24 +0000 (-0800)
Subject: [PATCH] USB: wakeup flag updates (3/3) isp116x-hcd
X-Git-Tag: v2.6.16-rc1~474^2~22^2~10^2~65
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=704aa0b7a9744d5f2b5c1fa68b826fcca73a2104;p=linux-2.6-omap-h63xx.git

[PATCH] USB: wakeup flag updates (3/3) isp116x-hcd

This makes the ISP116x HCD use the driver model wakeup flags for its
controller, not the flags in the HCD glue (which will be removed).

Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---

diff --git a/drivers/usb/host/isp116x-hcd.c b/drivers/usb/host/isp116x-hcd.c
index 342cfadc999..c95af116f9e 100644
--- a/drivers/usb/host/isp116x-hcd.c
+++ b/drivers/usb/host/isp116x-hcd.c
@@ -1378,7 +1378,8 @@ static int isp116x_start(struct usb_hcd *hcd)
 
 	val = 0;
 	if (board->remote_wakeup_enable) {
-		hcd->can_wakeup = 1;
+		if (!device_can_wakeup(hcd->self.controller))
+			device_init_wakeup(hcd->self.controller, 1);
 		val |= RH_HS_DRWE;
 	}
 	isp116x_write_reg32(isp116x, HCRHSTATUS, val);
@@ -1428,7 +1429,7 @@ static int isp116x_bus_suspend(struct usb_hcd *hcd)
 		hcd->state = HC_STATE_QUIESCING;
 		val &= (~HCCONTROL_HCFS & ~HCCONTROL_RWE);
 		val |= HCCONTROL_USB_SUSPEND;
-		if (hcd->remote_wakeup)
+		if (device_may_wakeup(&hcd->self.root_hub->dev))
 			val |= HCCONTROL_RWE;
 		/* Wait for usb transfers to finish */
 		mdelay(2);