linux-kernel - [PATCH -next] staging: fix arlan build-braces

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite for Android: free password hash cracker in your pocket

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-Id: <20100506164303.510040dd.randy.dunlap@oracle.com>
Date:	Thu, 6 May 2010 16:43:03 -0700
From:	Randy Dunlap <randy.dunlap@...cle.com>
To:	Stephen Rothwell <sfr@...b.auug.org.au>, gregkh@...e.de
Cc:	linux-next@...r.kernel.org, LKML <linux-kernel@...r.kernel.org>,
	devel@...verdev.osuosl.org
Subject: [PATCH -next] staging: fix arlan build-braces

From: Randy Dunlap <randy.dunlap@...cle.com>

The braces on the writeControlRegister() macro are not sufficient
(at least for one version of gcc):

drivers/staging/arlan/arlan-main.c:230: error: 'else' without a previous 'if'
drivers/staging/arlan/arlan-main.c:236: error: 'else' without a previous 'if'
drivers/staging/arlan/arlan-main.c:242: error: 'else' without a previous 'if'
drivers/staging/arlan/arlan-main.c:250: error: 'else' without a previous 'if'
drivers/staging/arlan/arlan-main.c:298: error: 'else' without a previous 'if'
drivers/staging/arlan/arlan-main.c:324: error: 'else' without a previous 'if'
drivers/staging/arlan/arlan-main.c:348: error: 'else' without a previous 'if'
drivers/staging/arlan/arlan-main.c:362: error: 'else' without a previous 'if'
drivers/staging/arlan/arlan-main.c:367: error: 'else' without a previous 'if'
drivers/staging/arlan/arlan-main.c:372: error: 'else' without a previous 'if'

Signed-off-by: Randy Dunlap <randy.dunlap@...cle.com>
---
 drivers/staging/arlan/arlan.h |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

--- linux-next-20100506.orig/drivers/staging/arlan/arlan.h
+++ linux-next-20100506/drivers/staging/arlan/arlan.h
@@ -461,10 +461,11 @@ struct arlan_private {
    int cr;   \
    \
    cr = readControlRegister(dev);\
-   if (cr & ARLAN_CHANNEL_ATTENTION) \
+   if (cr & ARLAN_CHANNEL_ATTENTION) { \
       writeControlRegister(dev, (cr & ~ARLAN_CHANNEL_ATTENTION));\
-   else \
+   } else { \
       writeControlRegister(dev, (cr | ARLAN_CHANNEL_ATTENTION));\
+   } \
 }
 
 #define clearChannelAttention(dev) { \
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/