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>

diff --git a/drivers/net/wireless/intel/iwlegacy/common.c b/drivers/net/wireless/intel/iwlegacy/common.c
index eb5cb603bc52990f48cbf1f55c8485f1c641b6b4..c3afaf71066eb1e6560c79ba62cf1b8df5970281 100644 (file)
--- a/drivers/net/wireless/intel/iwlegacy/common.c
+++ b/drivers/net/wireless/intel/iwlegacy/common.c
@@ -723,10 +723,9 @@ il_eeprom_init(struct il_priv *il)
        sz = il->cfg->eeprom_size;
        D_EEPROM("NVM size = %d\n", sz);
        il->eeprom = kzalloc(sz, GFP_KERNEL);
-       if (!il->eeprom) {
-               ret = -ENOMEM;
-               goto alloc_err;
-       }
+       if (!il->eeprom)
+               return -ENOMEM;
+
        e = (__le16 *) il->eeprom;
 
        il->ops->apm_init(il);
@@ -778,7 +777,6 @@ err:
                il_eeprom_free(il);
        /* Reset chip to save power until we load uCode during "up". */
        il_apm_stop(il);
-alloc_err:
        return ret;
 }
 EXPORT_SYMBOL(il_eeprom_init);