aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/staging/rtl8712/rtl871x_mp.c
diff options
context:
space:
mode:
authorLuis de Bethencourt <luisbg@osg.samsung.com>2015-10-19 18:15:29 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2015-10-24 19:26:59 -0700
commit168a2c10288d78f1e8504d132f59bb407f4fb9a6 (patch)
treec97261b129a767f4427d1a8379699f3bf494a6cd /drivers/staging/rtl8712/rtl871x_mp.c
parentstaging: rtl8712: Remove boolean comparisons (diff)
downloadlinux-dev-168a2c10288d78f1e8504d132f59bb407f4fb9a6.tar.xz
linux-dev-168a2c10288d78f1e8504d132f59bb407f4fb9a6.zip
staging: rtl8712: braces should be used on all arms
Fix all instances of the following checkpatch.pl check: CHECK: braces {} should be used on all arms of this statement Signed-off-by: Luis de Bethencourt <luisbg@osg.samsung.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/rtl8712/rtl871x_mp.c')
-rw-r--r--drivers/staging/rtl8712/rtl871x_mp.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/staging/rtl8712/rtl871x_mp.c b/drivers/staging/rtl8712/rtl871x_mp.c
index 26201ea3cca6..678305501d63 100644
--- a/drivers/staging/rtl8712/rtl871x_mp.c
+++ b/drivers/staging/rtl8712/rtl871x_mp.c
@@ -237,8 +237,9 @@ static u8 set_bb_reg(struct _adapter *pAdapter,
org_value = r8712_bb_reg_read(pAdapter, offset);
bit_shift = bitshift(bitmask);
new_value = ((org_value & (~bitmask)) | (value << bit_shift));
- } else
+ } else {
new_value = value;
+ }
return r8712_bb_reg_write(pAdapter, offset, new_value);
}
@@ -262,8 +263,9 @@ static u8 set_rf_reg(struct _adapter *pAdapter, u8 path, u8 offset, u32 bitmask,
org_value = r8712_rf_reg_read(pAdapter, path, offset);
bit_shift = bitshift(bitmask);
new_value = ((org_value & (~bitmask)) | (value << bit_shift));
- } else
+ } else {
new_value = value;
+ }
return r8712_rf_reg_write(pAdapter, path, offset, new_value);
}