On Sunday, 24 of February 2008, Mirco Tischler wrote:> > On Sa, 2008-02-23 at 19:13 +0100, Rafael J. Wysocki wrote:> > Index: linux-2.6/drivers/usb/host/u132-hcd.c> > ===================================================================> > --- linux-2.6.orig/drivers/usb/host/u132-hcd.c> > +++ linux-2.6/drivers/usb/host/u132-hcd.c> > @@ -3214,14 +3214,19 @@ static int u132_suspend(struct platform_> > return -ESHUTDOWN;> > } else {> > int retval = 0;> > - if (state.event == PM_EVENT_FREEZE) {> > +> > + switch (state.event) {> > + case PM_EVENT_FREEZE:> > retval = u132_bus_suspend(hcd);> > - } else if (state.event == PM_EVENT_SUSPEND) {> > + break;> > + case PM_EVENT_SUSPEND:> > + case PM_EVENT_HIBERNATE:> > int ports = MAX_U132_PORTS;> > while (ports-- > 0) {> > port_power(u132, ports, 0);> > }> > - }> > + break;> > + }> > if (retval == 0)> > pdev->dev.power.power_state = state;> > return retval;> Hmm. Doesn't compile for me in 2.6.25-rc2-git7:> > CC [M] drivers/usb/host/u132-hcd.o> drivers/usb/host/u132-hcd.c: In function ‘u132_suspend’:> drivers/usb/host/u132-hcd.c:3224: error: expected expression before> ‘int’> drivers/usb/host/u132-hcd.c:3225: error: ‘ports’ undeclared (first use> in this function)> drivers/usb/host/u132-hcd.c:3225: error: (Each undeclared identifier is> reported only once> drivers/usb/host/u132-hcd.c:3225: error: for each function it appears> in.)> make[3]: *** [drivers/usb/host/u132-hcd.o] Error 1> make[2]: *** [drivers/usb/host] Error 2> make[1]: *** [drivers/usb] Error 2> make: *** [drivers] Error 2> > This fixes it:> > Thanks> Mirco> > ---> From: Mirco Tischler <mt-ml@xxxxxx>> > Fixes the following compile error caused by commit> 3a2d5b700132f35401f1d9e22fe3c2cab02c2549> > ...> CC [M] drivers/usb/host/u132-hcd.o> drivers/usb/host/u132-hcd.c: In function ‘u132_suspend’:> drivers/usb/host/u132-hcd.c:3224: error: expected expression before> ‘int’> drivers/usb/host/u132-hcd.c:3225: error: ‘ports’ undeclared (first use> in this function)> ...> > Signed-off-by: Mirco Tischler <mt-ml@xxxxxx>> ---> drivers/usb/host/u132-hcd.c | 3 ++-> 1 files changed, 2 insertions(+), 1 deletions(-)> > diff --git a/drivers/usb/host/u132-hcd.c b/drivers/usb/host/u132-hcd.c> index 6fca069..58830b2 100644> --- a/drivers/usb/host/u132-hcd.c> +++ b/drivers/usb/host/u132-hcd.c> @@ -3214,6 +3214,7 @@ static int u132_suspend(struct platform_device> *pdev, pm_message_t state)> return -ESHUTDOWN;> } else {> int retval = 0;> + int ports = 0;
Hm, why not to do:
--- drivers/usb/host/u132-hcd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
Index: linux-2.6/drivers/usb/host/u132-hcd.c===================================================================--- linux-2.6.orig/drivers/usb/host/u132-hcd.c+++ linux-2.6/drivers/usb/host/u132-hcd.c@@ -3214,6 +3214,7 @@ static int u132_suspend(struct platform_ return -ESHUTDOWN; } else { int retval = 0;+ int ports = MAX_U132_PORTS; switch (state.event) { case PM_EVENT_FREEZE:@@ -3221,7 +3222,6 @@ static int u132_suspend(struct platform_ break; case PM_EVENT_SUSPEND: case PM_EVENT_HIBERNATE:- int ports = MAX_U132_PORTS; while (ports-- > 0) { port_power(u132, ports, 0); }_______________________________________________linux-pm mailing listlinux-pm@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx://lists.linux-foundation.org/mailman/listinfo/linux-pm
