Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/egtvedt...

[karo-tx-linux.git] / drivers / net / wireless / rsi / rsi_91x_sdio_ops.c

diff --git a/drivers/net/wireless/rsi/rsi_91x_sdio_ops.c b/drivers/net/wireless/rsi/rsi_91x_sdio_ops.c
index 1c6788aecc62658fe2cc7c4961415ef4715c8dde..40d72312f3df21dd6e4e12019febd6363a6f7912 100644 (file)
--- a/drivers/net/wireless/rsi/rsi_91x_sdio_ops.c
+++ b/drivers/net/wireless/rsi/rsi_91x_sdio_ops.c
@@ -203,8 +203,10 @@ static int rsi_load_ta_instructions(struct rsi_common *common)
 
        /* Copy firmware into DMA-accessible memory */
        fw = kmemdup(fw_entry->data, fw_entry->size, GFP_KERNEL);
-       if (!fw)
-               return -ENOMEM;
+       if (!fw) {
+               status = -ENOMEM;
+               goto out;
+       }
        len = fw_entry->size;
 
        if (len % 4)
@@ -217,6 +219,8 @@ static int rsi_load_ta_instructions(struct rsi_common *common)
 
        status = rsi_copy_to_card(common, fw, len, num_blocks);
        kfree(fw);
+
+out:
        release_firmware(fw_entry);
        return status;
 }