[PATCH] OMAP2 STI: fix build breakage

[PATCH] OMAP2 STI: fix build breakage

[Paul Walmsley]

n800_defconfig no longer builds after commit
8423eaf634aa187e2ab3cd1018ea0f2f7d31148a; fix.

  CC      drivers/misc/sti/sti-netlink.o
drivers/misc/sti/sti-netlink.c: In function 'sti_netlink_receive_msg':
drivers/misc/sti/sti-netlink.c:84: error: expected expression before 'int'
drivers/misc/sti/sti-netlink.c:91: error: 'len' undeclared (first use in this function)
drivers/misc/sti/sti-netlink.c:91: error: (Each undeclared identifier is reported only once
drivers/misc/sti/sti-netlink.c:91: error: for each function it appears in.)

Signed-off-by: Paul Walmsley <paul@pwsan.com>
Cc: Roman Tereshenkov <roman.tereshonkov@nokia.com>
Cc: Felipe Balbi <felipe.balbi@nokia.com>
Cc: Tony Lindgren <tony@atomide.com>
---
 drivers/misc/sti/sti-netlink.c |    5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/drivers/misc/sti/sti-netlink.c b/drivers/misc/sti/sti-netlink.c
index b198e4c..dbd6a03 100644
--- a/drivers/misc/sti/sti-netlink.c
+++ b/drivers/misc/sti/sti-netlink.c
@@ -68,7 +68,8 @@ static int sti_netlink_receive_msg(struct sk_buff *skb, struct nlmsghdr *nlh)
 {
 	void *data;
 	u8 chan, id;
-	int size, ret = 0;
+	int size;
+	int ret = 0, len = 0;
 
 	data	= NLMSG_DATA(nlh);
 	chan	= (nlh->nlmsg_flags >> 8) & 0xff;
@@ -81,8 +82,6 @@ static int sti_netlink_receive_msg(struct sk_buff *skb, struct nlmsghdr *nlh)
 		break;
 #if defined(CONFIG_ARCH_OMAP1) || defined(CONFIG_ARCH_OMAP2)
 	case STI_READ:
-		int len = 0;
-
 		data = kmalloc(size, GFP_KERNEL);
 		if (!data)
 			return -ENOMEM;

Re: [PATCH] OMAP2 STI: fix build breakage

[Tony Lindgren]

* Paul Walmsley <paul@pwsan.com> [081130 23:29]:
> 
> n800_defconfig no longer builds after commit
> 8423eaf634aa187e2ab3cd1018ea0f2f7d31148a; fix.
> 
>   CC      drivers/misc/sti/sti-netlink.o
> drivers/misc/sti/sti-netlink.c: In function 'sti_netlink_receive_msg':
> drivers/misc/sti/sti-netlink.c:84: error: expected expression before 'int'
> drivers/misc/sti/sti-netlink.c:91: error: 'len' undeclared (first use in this function)
> drivers/misc/sti/sti-netlink.c:91: error: (Each undeclared identifier is reported only once
> drivers/misc/sti/sti-netlink.c:91: error: for each function it appears in.)

Pushing today.

Tony


> 
> Signed-off-by: Paul Walmsley <paul@pwsan.com>
> Cc: Roman Tereshenkov <roman.tereshonkov@nokia.com>
> Cc: Felipe Balbi <felipe.balbi@nokia.com>
> Cc: Tony Lindgren <tony@atomide.com>
> ---
>  drivers/misc/sti/sti-netlink.c |    5 ++---
>  1 files changed, 2 insertions(+), 3 deletions(-)
> 
> diff --git a/drivers/misc/sti/sti-netlink.c b/drivers/misc/sti/sti-netlink.c
> index b198e4c..dbd6a03 100644
> --- a/drivers/misc/sti/sti-netlink.c
> +++ b/drivers/misc/sti/sti-netlink.c
> @@ -68,7 +68,8 @@ static int sti_netlink_receive_msg(struct sk_buff *skb, struct nlmsghdr *nlh)
>  {
>  	void *data;
>  	u8 chan, id;
> -	int size, ret = 0;
> +	int size;
> +	int ret = 0, len = 0;
>  
>  	data	= NLMSG_DATA(nlh);
>  	chan	= (nlh->nlmsg_flags >> 8) & 0xff;
> @@ -81,8 +82,6 @@ static int sti_netlink_receive_msg(struct sk_buff *skb, struct nlmsghdr *nlh)
>  		break;
>  #if defined(CONFIG_ARCH_OMAP1) || defined(CONFIG_ARCH_OMAP2)
>  	case STI_READ:
> -		int len = 0;
> -
>  		data = kmalloc(size, GFP_KERNEL);
>  		if (!data)
>  			return -ENOMEM;