Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1596328

[PATCH v2 4/5] staging: rtl8192e: Fix unbalanced braces around else statement

Show all headers | View raw

From: Suniel Mahesh <sunil.m@techveda.org>

Fix unbalanced braces around else statement reported by checkpatch.pl

Signed-off-by: Suniel Mahesh <sunil.m@techveda.org>
---
Changes for v2:

- new patch addition to the series
- Rebased on top of next-20170306
---
 drivers/staging/rtl8192e/rtl8192e/rtl_core.c | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c b/drivers/staging/rtl8192e/rtl8192e/rtl_core.c
index 028755b..fb711d2 100644
--- a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c
+++ b/drivers/staging/rtl8192e/rtl8192e/rtl_core.c
@@ -2257,17 +2257,20 @@ static int _rtl92e_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
 
 		if (ipw->cmd == IEEE_CMD_SET_ENCRYPTION) {
 			if (ipw->u.crypt.set_tx) {
-				if (strcmp(ipw->u.crypt.alg, "CCMP") == 0)
+				if (strcmp(ipw->u.crypt.alg, "CCMP") == 0) {
 					ieee->pairwise_key_type = KEY_TYPE_CCMP;
-				else if (strcmp(ipw->u.crypt.alg, "TKIP") == 0)
+				} else if (strcmp(ipw->u.crypt.alg,
+						  "TKIP") == 0) {
 					ieee->pairwise_key_type = KEY_TYPE_TKIP;
-				else if (strcmp(ipw->u.crypt.alg, "WEP") == 0) {
-					if (ipw->u.crypt.key_len == 13)
+				} else if (strcmp(ipw->u.crypt.alg,
+						  "WEP") == 0) {
+					if (ipw->u.crypt.key_len == 13) {
 						ieee->pairwise_key_type =
 							 KEY_TYPE_WEP104;
-					else if (ipw->u.crypt.key_len == 5)
+					} else if (ipw->u.crypt.key_len == 5) {
 						ieee->pairwise_key_type =
 							 KEY_TYPE_WEP40;
+					}
 				} else {
 					ieee->pairwise_key_type = KEY_TYPE_NA;
 				}
@@ -2322,9 +2325,9 @@ static int _rtl92e_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
 					else if (ipw->u.crypt.key_len == 5)
 						ieee->group_key_type =
 							 KEY_TYPE_WEP40;
-				} else
+				} else {
 					ieee->group_key_type = KEY_TYPE_NA;
-
+				}
 				if (ieee->group_key_type) {
 					rtl92e_set_swcam(dev, ipw->u.crypt.idx,
 							 ipw->u.crypt.idx,
-- 
1.9.1

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH] staging: rtl8192e: fix coding style issue, improve error handling Suniel Mahesh <sunil.m@techveda.org> - 2017-03-07 08:20 +0100
  Re: [PATCH] staging: rtl8192e: fix coding style issue, improve error  handling Dan Carpenter <dan.carpenter@oracle.com> - 2017-03-07 18:20 +0100
    [PATCH v2 1/5] staging: rtl8192e: Fix coding style issues sunil.m@techveda.org - 2017-03-09 20:00 +0100
      Re: [PATCH v2 1/5] staging: rtl8192e: Fix coding style issues Greg KH <gregkh@linuxfoundation.org> - 2017-03-12 14:50 +0100
    [PATCH v2 3/5] staging: rtl8192e: Rectify pointer comparisions sunil.m@techveda.org - 2017-03-09 20:00 +0100
    [PATCH v2 2/5] staging: rtl8192e: Improve error handling sunil.m@techveda.org - 2017-03-09 20:00 +0100
    [PATCH v2 4/5] staging: rtl8192e: Fix unbalanced braces around else statement sunil.m@techveda.org - 2017-03-09 20:00 +0100
    [PATCH v2 0/5] staging: rtl8192e: Fix coding style, warnings and checks  sunil.m@techveda.org - 2017-03-09 20:00 +0100
      [PATCH v2 5/5] staging: rtl8192e: Pass a pointer as an argument to sizeof() instead of struct sunil.m@techveda.org - 2017-03-09 20:00 +0100

csiph-web