Message ID | 5686E263.1020901@users.sourceforge.net (mailing list archive) |
---|---|
State | Superseded |
Delegated to: | Kalle Valo |
Headers | show |
On Sat, Jan 2, 2016 at 2:02 AM, SF Markus Elfring <elfring@users.sourceforge.net> wrote: > From: Markus Elfring <elfring@users.sourceforge.net> > Date: Fri, 1 Jan 2016 21:16:01 +0100 > > Rename a jump label according to the current Linux coding style convention. > > Signed-off-by: Markus Elfring <elfring@users.sourceforge.net> > --- > 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 ae45fd3..660ab2b 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; Current code looks good. > } > 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); > > if (ret) { > -- > 2.6.3 > > -- > To unsubscribe from this list: send the line "unsubscribe linux-wireless" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html -Souptick -- To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/net/wireless/intel/iwlegacy/common.c b/drivers/net/wireless/intel/iwlegacy/common.c index ae45fd3..660ab2b 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); if (ret) {