From: Markus Elfring <elfring@xxxxxxxxxxxxxxxxxxxxx>
Rename a jump label according to the current Linux coding style convention.
Signed-off-by: Markus Elfring <elfring@xxxxxxxxxxxxxxxxxxxxx>
[Rewrote commit title]
Signed-off-by: Julian Calaby <julian.calaby@xxxxxxxxx>
---
This was controversial when introduced, however the change is obvious and
harmless and is, in the worst case, just churn.
I'm only including this as it meets my criteria for sheparding pending
patches: it's sane, obviously correct or reviewable by me, and doesn't
require any work to apply.
This does meet those requirements, however given how controviersial it was
when introduced, I'm not expecting people to be enthusiastic about
applying it.
Thanks,
Julian Calaby
---
drivers/net/wireless/intel/iwlegacy/common.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/net/wireless/intel/iwlegacy/common.c b/drivers/net/wireless/intel/iwlegacy/common.c
index 2cc3d42..a1b1360 100644
--- a/drivers/net/wireless/intel/iwlegacy/common.c
+++ b/drivers/net/wireless/intel/iwlegacy/common.c
@@ -759,7 +759,7 @@ il_eeprom_init(struct il_priv *il)
IL_EEPROM_ACCESS_TIMEOUT);
if (ret < 0) {
IL_ERR("Time out reading EEPROM[%d]\n", addr);
- goto done;
+ goto release_semaphore;
}
r = _il_rd(il, CSR_EEPROM_REG);
e[addr / 2] = cpu_to_le16(r >> 16);
@@ -769,7 +769,7 @@ il_eeprom_init(struct il_priv *il)
il_eeprom_query16(il, EEPROM_VERSION));
ret = 0;
-done:
+release_semaphore:
il->ops->eeprom_release_semaphore(il);
err:
--
2.7.0
--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
