Merge branch 'omap-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind...

[karo-tx-linux.git] / net / bridge / br_sysfs_br.c

diff --git a/net/bridge/br_sysfs_br.c b/net/bridge/br_sysfs_br.c
index ee4820aa1843ee5e54c1b677f4cd5875a440d442..bee4f300d0c82a4adead252b43949ba3b9e84026 100644 (file)
--- a/net/bridge/br_sysfs_br.c
+++ b/net/bridge/br_sysfs_br.c
@@ -316,9 +316,9 @@ static ssize_t store_group_addr(struct device *d,
        if (new_addr[5] & ~0xf)
                return -EINVAL;
 
-       if (new_addr[5] == 1    /* 802.3x Pause address */
-           || new_addr[5] == 2 /* 802.3ad Slow protocols */
-           || new_addr[5] == 3) /* 802.1X PAE address */
+       if (new_addr[5] == 1 ||         /* 802.3x Pause address */
+           new_addr[5] == 2 ||         /* 802.3ad Slow protocols */
+           new_addr[5] == 3)           /* 802.1X PAE address */
                return -EINVAL;
 
        spin_lock_bh(&br->lock);