From: Paul Walmsley <paul@pwsan.com>
Date: Mon, 1 Dec 2008 07:28:58 +0000 (-0700)
Subject: OMAP2 STI: fix build breakage
X-Git-Tag: v2.6.28-omap1~95
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=a4c588e944eff8fc14858ef73428af07b11e28a1;p=linux-2.6-omap-h63xx.git

OMAP2 STI: fix build breakage

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>
Signed-off-by: Tony Lindgren <tony@atomide.com>
---

diff --git a/drivers/misc/sti/sti-netlink.c b/drivers/misc/sti/sti-netlink.c
index b198e4c3cc2..dbd6a03ec20 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;