Skip to content

Commit

Permalink
sb1000: fix a couple of indentation issues and remove assignment in i…
Browse files Browse the repository at this point in the history
…f 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>
  • Loading branch information
Colin Ian King authored and David S. Miller committed Jan 18, 2019
1 parent 22c2ad6 commit 6394d98
Showing 1 changed file with 7 additions and 4 deletions.
11 changes: 7 additions & 4 deletions drivers/net/sb1000.c
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
Expand Down

0 comments on commit 6394d98

Please sign in to comment.