summary refs log tree commit diff
path: root/drivers/net/sb1000.c
diff options
context:
space:
mode:
authorColin Ian King <colin.king@canonical.com>2019-01-17 00:35:43 +0000
committerDavid S. Miller <davem@davemloft.net>2019-01-17 21:51:36 -0800
commit6394d98df6b47a4fe28715536bd6c8e003847071 (patch)
tree376958c2016acb549d0c0c028408dfd23b09acd1 /drivers/net/sb1000.c
parent22c2ad616b74f3de2256b242572ab449d031d941 (diff)
downloadlinux-6394d98df6b47a4fe28715536bd6c8e003847071.tar.gz
sb1000: fix a couple of indentation issues and remove assignment in if statements
There is an if statement and a return statement that are incorrectly
indented. Fix these.  Also replace the assignment-in-if statements
to assignment followed by an if to keep to the coding style.

Signed-off-by: Colin Ian King <colin.king@canonical.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/sb1000.c')
-rw-r--r--drivers/net/sb1000.c11
1 files changed, 7 insertions, 4 deletions
diff --git a/drivers/net/sb1000.c b/drivers/net/sb1000.c
index 7820fced33f6..941cfa8f1c2a 100644
--- a/drivers/net/sb1000.c
+++ b/drivers/net/sb1000.c
@@ -535,17 +535,20 @@ sb1000_activate(const int ioaddr[], const char* name)
 	int status;
 
 	ssleep(1);
-	if ((status = card_send_command(ioaddr, name, Command0, st)))
+	status = card_send_command(ioaddr, name, Command0, st);
+	if (status)
 		return status;
-	if ((status = card_send_command(ioaddr, name, Command1, st)))
+	status = card_send_command(ioaddr, name, Command1, st);
+	if (status)
 		return status;
 	if (st[3] != 0xf1) {
-    	if ((status = sb1000_start_get_set_command(ioaddr, name)))
+		status = sb1000_start_get_set_command(ioaddr, name);
+		if (status)
 			return status;
 		return -EIO;
 	}
 	udelay(1000);
-    return sb1000_start_get_set_command(ioaddr, name);
+	return sb1000_start_get_set_command(ioaddr, name);
 }
 
 /* get SB1000 firmware version */