]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
OMAP2 STI: fix build breakage
authorPaul Walmsley <paul@pwsan.com>
Mon, 1 Dec 2008 07:28:58 +0000 (00:28 -0700)
committerTony Lindgren <tony@atomide.com>
Thu, 4 Dec 2008 23:29:35 +0000 (15:29 -0800)
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>
drivers/misc/sti/sti-netlink.c

index b198e4c3cc2b8cdf60337bef75d2f32bc2395f7e..dbd6a03ec207d3c4f6df17233f37b5142ac7413c 100644 (file)
@@ -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;