Commit a4c588e9 authored by Paul Walmsley's avatar Paul Walmsley Committed by Tony Lindgren

OMAP2 STI: fix build breakage

n800_defconfig no longer builds after commit
8423eaf6; 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: default avatarPaul 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: default avatarTony Lindgren <tony@atomide.com>
parent 75b7ae0e
...@@ -68,7 +68,8 @@ static int sti_netlink_receive_msg(struct sk_buff *skb, struct nlmsghdr *nlh) ...@@ -68,7 +68,8 @@ static int sti_netlink_receive_msg(struct sk_buff *skb, struct nlmsghdr *nlh)
{ {
void *data; void *data;
u8 chan, id; u8 chan, id;
int size, ret = 0; int size;
int ret = 0, len = 0;
data = NLMSG_DATA(nlh); data = NLMSG_DATA(nlh);
chan = (nlh->nlmsg_flags >> 8) & 0xff; chan = (nlh->nlmsg_flags >> 8) & 0xff;
...@@ -81,8 +82,6 @@ static int sti_netlink_receive_msg(struct sk_buff *skb, struct nlmsghdr *nlh) ...@@ -81,8 +82,6 @@ static int sti_netlink_receive_msg(struct sk_buff *skb, struct nlmsghdr *nlh)
break; break;
#if defined(CONFIG_ARCH_OMAP1) || defined(CONFIG_ARCH_OMAP2) #if defined(CONFIG_ARCH_OMAP1) || defined(CONFIG_ARCH_OMAP2)
case STI_READ: case STI_READ:
int len = 0;
data = kmalloc(size, GFP_KERNEL); data = kmalloc(size, GFP_KERNEL);
if (!data) if (!data)
return -ENOMEM; return -ENOMEM;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment