Merge tag 'multiplatform' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

[~andy/linux] / drivers / staging / csr / data_tx.c

diff --git a/drivers/staging/csr/data_tx.c b/drivers/staging/csr/data_tx.c
index d2c29545058e8258a18f2fa40d1a6ccc7e3ba5e6..9e3d8b8ab02cb7d6bcdde7b1c45fbf57d28678c1 100644 (file)
--- a/drivers/staging/csr/data_tx.c
+++ b/drivers/staging/csr/data_tx.c
@@ -22,9 +22,8 @@ uf_verify_m4(unifi_priv_t *priv, const unsigned char *packet, unsigned int lengt
        u16 keyinfo;
 
 
-       if (length < (4 + 5 + 8 + 32 + 16 + 8 + 8 + 16 + 1 + 8)) {
+       if (length < (4 + 5 + 8 + 32 + 16 + 8 + 8 + 16 + 1 + 8))
                return 1;
-       }
 
        p += 8;
        keyinfo = p[5] << 8 | p[6]; /* big-endian */
@@ -38,11 +37,9 @@ uf_verify_m4(unifi_priv_t *priv, const unsigned char *packet, unsigned int lengt
          (p[4 + 5 + 8 + 32 + 16 + 8 + 8 + 16 + 0] == 0 && /* key data length (2 octets) 0 for 4/4 only */
           p[4 + 5 + 8 + 32 + 16 + 8 + 8 + 16 + 1] == 0)
        ) {
-               unifi_trace(priv, UDBG1, "uf_verify_m4: M4 detected \n");
+               unifi_trace(priv, UDBG1, "uf_verify_m4: M4 detected\n");
                return 0;
-       }
-       else
-       {
+       } else {
                return 1;
        }
 }