1 files changed, 12 insertions, 7 deletions

diff --git a/drivers/misc/mic/host/mic_x100.c b/drivers/misc/mic/host/mic_x100.c
index 8118ac48c764..82a973c85b5d 100644
--- a/drivers/misc/mic/host/mic_x100.c
+++ b/drivers/misc/mic/host/mic_x100.c
@@ -450,26 +450,29 @@ mic_x100_load_firmware(struct mic_device *mdev, const char *buf)
 
         rc = mic_x100_get_boot_addr(mdev);
         if (rc)
-                goto error;
+                return rc;
         /* load OS */
         rc = request_firmware(&fw, mdev->cosm_dev->firmware, &mdev->pdev->dev);
         if (rc < 0) {
                 dev_err(&mdev->pdev->dev,
                         "ramdisk request_firmware failed: %d %s\n",
                         rc, mdev->cosm_dev->firmware);
-                goto error;
+                return rc;
         }
         if (mdev->bootaddr > mdev->aper.len - fw->size) {
                 rc = -EINVAL;
                 dev_err(&mdev->pdev->dev, "%s %d rc %d bootaddr 0x%x\n",
                         __func__, __LINE__, rc, mdev->bootaddr);
-                release_firmware(fw);
                 goto error;
         }
         memcpy_toio(mdev->aper.va + mdev->bootaddr, fw->data, fw->size);
         mdev->ops->write_spad(mdev, MIC_X100_FW_SIZE, fw->size);
-        if (!strcmp(mdev->cosm_dev->bootmode, "flash"))
-                goto done;
+        if (!strcmp(mdev->cosm_dev->bootmode, "flash")) {
+                rc = -EINVAL;
+                dev_err(&mdev->pdev->dev, "%s %d rc %d\n",
+                        __func__, __LINE__, rc);
+                goto error;
+        }
         /* load command line */
         rc = mic_x100_load_command_line(mdev, fw);
         if (rc) {
@@ -481,9 +484,11 @@ mic_x100_load_firmware(struct mic_device *mdev, const char *buf)
         /* load ramdisk */
         if (mdev->cosm_dev->ramdisk)
                 rc = mic_x100_load_ramdisk(mdev);
+
+        return rc;
+
 error:
-        dev_dbg(&mdev->pdev->dev, "%s %d rc %d\n", __func__, __LINE__, rc);
-done:
+        release_firmware(fw);
         return rc;
 }