lists.openwall.net   lists  /  announce  owl-users  owl-dev  john-users  john-dev  passwdqc-users  yescrypt  popa3d-users  /  oss-security  kernel-hardening  musl  sabotage  tlsify  passwords  /  crypt-dev  xvendor  /  Bugtraq  Full-Disclosure  linux-kernel  linux-netdev  linux-ext4  linux-hardening  linux-cve-announce  PHC 
Open Source and information security mailing list archives
 
Hash Suite: Windows password security audit tool. GUI, reports in PDF.
[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Date:	Tue, 13 Jan 2015 12:57:01 +0100
From:	Bilel DRIRA <bilel.dr@...il.com>
To:	marek.belisko@...il.com, gregkh@...uxfoundation.org,
	joe@...ches.com, tapaswenipathak@...il.com, gdonald@...il.com,
	aybuke.147@...il.com, devel@...verdev.osuosl.org,
	linux-kernel@...r.kernel.org
Cc:	Bilel DRIRA <bilel.dr@...il.com>
Subject: [PATCH] staging: ft1000: fix else style error

This patch fix the checkpatch.pl error:

	ERROR: else should follow close brace '}'

Signed-off-by: Bilel DRIRA <bilel.dr@...il.com>
---
 drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.c |   15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.c b/drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.c
index e9a37ee..cf0683f 100644
--- a/drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.c
+++ b/drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.c
@@ -572,8 +572,7 @@ static void ft1000_hbchk(u_long data)
 		if (tempword != ho) {
 			if (info->AsicID == ELECTRABUZZ_ID) {
 				tempword = ft1000_read_dpram(dev, FT1000_HI_HO);
-			}
-			else {
+			} else {
 				tempword = ntohs(ft1000_read_dpram_mag_16(dev, FT1000_MAG_HI_HO, FT1000_MAG_HI_HO_INDX));
 			}
 		}
@@ -688,15 +687,13 @@ static void ft1000_hbchk(u_long data)
 		if (tempword != hi) {
 			if (info->AsicID == ELECTRABUZZ_ID) {
 				ft1000_write_dpram(dev, FT1000_HI_HO, hi);
-			}
-			else {
+			} else {
 				ft1000_write_dpram_mag_16(dev, FT1000_MAG_HI_HO, hi_mag, FT1000_MAG_HI_HO_INDX);
 			}
 
 			if (info->AsicID == ELECTRABUZZ_ID) {
 				tempword = ft1000_read_dpram(dev, FT1000_HI_HO);
-			}
-			else {
+			} else {
 				tempword = ntohs(ft1000_read_dpram_mag_16(dev, FT1000_MAG_HI_HO, FT1000_MAG_HI_HO_INDX));
 			}
 
@@ -959,8 +956,7 @@ static void ft1000_proc_drvmsg(struct net_device *dev)
 
 	if (info->AsicID == ELECTRABUZZ_ID) {
 		tempword = FT1000_DPRAM_RX_BASE+2;
-	}
-	else {
+	} else {
 		tempword = FT1000_DPRAM_MAG_RX_BASE;
 	}
 	if (ft1000_receive_cmd(dev, &cmdbuffer[0], MAX_CMD_SQSIZE, &tempword)) {
@@ -1039,8 +1035,7 @@ static void ft1000_proc_drvmsg(struct net_device *dev)
 						info->ConTm = 0;
 					}
 				}
-			}
-			else {
+			} else {
 				pr_debug("Media is down\n");
 				if (info->mediastate == 1) {
 					info->mediastate = 0;
-- 
1.7.9.5

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Powered by blists - more mailing lists

Powered by Openwall GNU/*/Linux Powered by OpenVZ