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

From: Randy Dunlap
Date: Thu May 06 2010 - 19:45:12 EST


From: Randy Dunlap <randy.dunlap@xxxxxxxxxx>

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@xxxxxxxxxx>
---
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@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/