diff options
author | Stefan Richter <stefanr@s5r6.in-berlin.de> | 2009-02-03 11:55:19 -0500 |
---|---|---|
committer | Stefan Richter <stefanr@s5r6.in-berlin.de> | 2009-03-24 15:56:48 -0400 |
commit | e1eff7a393d4a4e3ad1cf65fcba899146840bfd2 (patch) | |
tree | 88a040babea1853f40072ed199a78b60f4dcb387 /drivers/firewire/fw-card.c | |
parent | d01b01787680a1156ff6a554e40baa460bb88efb (diff) |
firewire: normalize a variable name
Standardize on if (err)
handle_error;
and if (ret < 0)
handle_error;
Don't call a variable err if we store values in it which mean success.
Also, offset some return statements by a blank line since this how we do
it in drivers/firewire.
Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>
Diffstat (limited to 'drivers/firewire/fw-card.c')
-rw-r--r-- | drivers/firewire/fw-card.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/drivers/firewire/fw-card.c b/drivers/firewire/fw-card.c index 27a3aae58cfd..08a7e18526ee 100644 --- a/drivers/firewire/fw-card.c +++ b/drivers/firewire/fw-card.c | |||
@@ -404,7 +404,7 @@ int fw_card_add(struct fw_card *card, | |||
404 | { | 404 | { |
405 | u32 *config_rom; | 405 | u32 *config_rom; |
406 | size_t length; | 406 | size_t length; |
407 | int err; | 407 | int ret; |
408 | 408 | ||
409 | card->max_receive = max_receive; | 409 | card->max_receive = max_receive; |
410 | card->link_speed = link_speed; | 410 | card->link_speed = link_speed; |
@@ -415,13 +415,14 @@ int fw_card_add(struct fw_card *card, | |||
415 | list_add_tail(&card->link, &card_list); | 415 | list_add_tail(&card->link, &card_list); |
416 | mutex_unlock(&card_mutex); | 416 | mutex_unlock(&card_mutex); |
417 | 417 | ||
418 | err = card->driver->enable(card, config_rom, length); | 418 | ret = card->driver->enable(card, config_rom, length); |
419 | if (err < 0) { | 419 | if (ret < 0) { |
420 | mutex_lock(&card_mutex); | 420 | mutex_lock(&card_mutex); |
421 | list_del(&card->link); | 421 | list_del(&card->link); |
422 | mutex_unlock(&card_mutex); | 422 | mutex_unlock(&card_mutex); |
423 | } | 423 | } |
424 | return err; | 424 | |
425 | return ret; | ||
425 | } | 426 | } |
426 | EXPORT_SYMBOL(fw_card_add); | 427 | EXPORT_SYMBOL(fw_card_add); |
427 | 428 | ||