mirror of
https://github.com/torvalds/linux
synced 2024-10-27 21:59:21 +00:00
iwlegacy: Return directly if allocation fails in il_eeprom_init()
Also remove an unused label. Signed-off-by: Markus Elfring <elfring@users.sourceforge.net> Acked-by: Stanislaw Gruszka <sgruszka@redhat.com> [Rewrote commit message] Signed-off-by: Julian Calaby <julian.calaby@gmail.com> Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
This commit is contained in:
parent
9e12904a95
commit
fb9693f045
|
@ -723,10 +723,9 @@ il_eeprom_init(struct il_priv *il)
|
||||||
sz = il->cfg->eeprom_size;
|
sz = il->cfg->eeprom_size;
|
||||||
D_EEPROM("NVM size = %d\n", sz);
|
D_EEPROM("NVM size = %d\n", sz);
|
||||||
il->eeprom = kzalloc(sz, GFP_KERNEL);
|
il->eeprom = kzalloc(sz, GFP_KERNEL);
|
||||||
if (!il->eeprom) {
|
if (!il->eeprom)
|
||||||
ret = -ENOMEM;
|
return -ENOMEM;
|
||||||
goto alloc_err;
|
|
||||||
}
|
|
||||||
e = (__le16 *) il->eeprom;
|
e = (__le16 *) il->eeprom;
|
||||||
|
|
||||||
il->ops->apm_init(il);
|
il->ops->apm_init(il);
|
||||||
|
@ -778,7 +777,6 @@ il_eeprom_init(struct il_priv *il)
|
||||||
il_eeprom_free(il);
|
il_eeprom_free(il);
|
||||||
/* Reset chip to save power until we load uCode during "up". */
|
/* Reset chip to save power until we load uCode during "up". */
|
||||||
il_apm_stop(il);
|
il_apm_stop(il);
|
||||||
alloc_err:
|
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
EXPORT_SYMBOL(il_eeprom_init);
|
EXPORT_SYMBOL(il_eeprom_init);
|
||||||
|
|
Loading…
Reference in a new issue