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
| ||
|
Date: Sat, 1 Nov 2014 10:47:26 +0800 From: Chen Weixiang <weixiangchen@...il.com> To: Marek Belisko <marek.belisko@...il.com>, Greg Kroah-Hartman <gregkh@...uxfoundation.org>, Chen Weixiang <weixiang.chen@...il.com>, Aybuke Ozdemir <aybuke.147@...il.com>, Felipe Balbi <balbi@...com>, Nicolas Thery <nthery@...il.com>, Greg Donald <gdonald@...il.com>, Daniel Dodge <danieldodgese@...il.com>, Wilfried Klaebe <w-lkml@...enslange-mailadresse.de> Cc: devel@...verdev.osuosl.org, linux-kernel@...r.kernel.org Subject: [PATCH v2 5/6] staging: ft1000: else should follow close brace '}' Remove code style error from ft1000/ft1000-pcmcia/ft1000_hw.c: ERROR: else should follow close brace '}' Signed-off-by: Chen Weixiang <weixiang.chen@...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 db194bc..48c1ef2 100644 --- a/drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.c +++ b/drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.c @@ -595,8 +595,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)); } } @@ -715,15 +714,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)); } @@ -994,8 +991,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)) { @@ -1075,8 +1071,7 @@ static void ft1000_proc_drvmsg(struct net_device *dev) info->ConTm = 0; } } - } - else { + } else { DEBUG(1, "Media is down\n"); if (info->mediastate == 1) { info->mediastate = 0; -- 2.1.2 -- 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