2008-02-24 03:45:39

by Adrian Bunk

Subject: [2.6.25 patch] fix drivers/usb/host/u132-hcd.c compilation

This patch fixes the following compile error caused by
commit 3a2d5b700132f35401f1d9e22fe3c2cab02c2549:

<-- snip -->

...
CC drivers/usb/host/u132-hcd.o
/home/bunk/linux/kernel-2.6/git/linux-2.6/drivers/usb/host/u132-hcd.c:
In function ‘u132_suspend’:
/home/bunk/linux/kernel-2.6/git/linux-2.6/drivers/usb/host/u132-hcd.c:3224: error: expected expression before ‘int’
/home/bunk/linux/kernel-2.6/git/linux-2.6/drivers/usb/host/u132-hcd.c:3225: error: ‘ports’ undeclared (first use in this function)
/home/bunk/linux/kernel-2.6/git/linux-2.6/drivers/usb/host/u132-hcd.c:3225: error: (Each undeclared identifier is reported only once
/home/bunk/linux/kernel-2.6/git/linux-2.6/drivers/usb/host/u132-hcd.c:3225: error: for each function it appears in.)
make[4]: *** [drivers/usb/host/u132-hcd.o] Error 1

<-- snip -->

Signed-off-by: Adrian Bunk <[email protected]>

---
69cf78da6371ad2aca30844858eeea318b37b3ec diff --git a/drivers/usb/host/u132-hcd.c b/drivers/usb/host/u132-hcd.c
index 6fca069..325c6c7 100644
--- a/drivers/usb/host/u132-hcd.c
+++ b/drivers/usb/host/u132-hcd.c
@@ -3221,9 +3221,11 @@ static int u132_suspend(struct platform_device *pdev, pm_message_t state)
break;
case PM_EVENT_SUSPEND:
case PM_EVENT_HIBERNATE:
- int ports = MAX_U132_PORTS;
- while (ports-- > 0) {
- port_power(u132, ports, 0);
+ {
+ int ports = MAX_U132_PORTS;
+ while (ports-- > 0) {
+ port_power(u132, ports, 0);
+ }
}
break;
}

2008-02-24 11:17:57

by Rafael J. Wysocki

Subject: Re: [2.6.25 patch] fix drivers/usb/host/u132-hcd.c compilation

On Sunday, 24 of February 2008, Adrian Bunk wrote:
> This patch fixes the following compile error caused by
> commit 3a2d5b700132f35401f1d9e22fe3c2cab02c2549:

Thanks, it has already been fixed in the mainline.

> <-- snip -->
>
> ...
> CC drivers/usb/host/u132-hcd.o
> /home/bunk/linux/kernel-2.6/git/linux-2.6/drivers/usb/host/u132-hcd.c:
> In function ‘u132_suspend’:
> /home/bunk/linux/kernel-2.6/git/linux-2.6/drivers/usb/host/u132-hcd.c:3224: error: expected expression before ‘int’
> /home/bunk/linux/kernel-2.6/git/linux-2.6/drivers/usb/host/u132-hcd.c:3225: error: ‘ports’ undeclared (first use in this function)
> /home/bunk/linux/kernel-2.6/git/linux-2.6/drivers/usb/host/u132-hcd.c:3225: error: (Each undeclared identifier is reported only once
> /home/bunk/linux/kernel-2.6/git/linux-2.6/drivers/usb/host/u132-hcd.c:3225: error: for each function it appears in.)
> make[4]: *** [drivers/usb/host/u132-hcd.o] Error 1
>
> <-- snip -->
>
> Signed-off-by: Adrian Bunk <[email protected]>
>
> ---
> 69cf78da6371ad2aca30844858eeea318b37b3ec diff --git a/drivers/usb/host/u132-hcd.c b/drivers/usb/host/u132-hcd.c
> index 6fca069..325c6c7 100644
> --- a/drivers/usb/host/u132-hcd.c
> +++ b/drivers/usb/host/u132-hcd.c
> @@ -3221,9 +3221,11 @@ static int u132_suspend(struct platform_device *pdev, pm_message_t state)
> break;
> case PM_EVENT_SUSPEND:
> case PM_EVENT_HIBERNATE:
> - int ports = MAX_U132_PORTS;
> - while (ports-- > 0) {
> - port_power(u132, ports, 0);
> + {
> + int ports = MAX_U132_PORTS;
> + while (ports-- > 0) {
> + port_power(u132, ports, 0);
> + }
> }
> break;
> }
>
>