pm8001: fix update_flash

The driver checks the return valu, but after he tries to wait_for_completion
which might never happen.  Also the ioctl buffer is freed at the end of the
function, so the first removal is not needed.

Signed-off-by: Tomas Henzl <thenzl@redhat.com>
Acked-by: Suresh Thiagarajan <Suresh.Thiagarajan@pmcs.com>
Signed-off-by: Christoph Hellwig <hch@lst.de>

diff --git a/drivers/scsi/pm8001/pm8001_ctl.c b/drivers/scsi/pm8001/pm8001_ctl.c
index ade62c8a19fa54e434d3f9098fb9b43a89a97715..d3a08aea09487e955d51b394b300826183b5c296 100644 (file)
--- a/drivers/scsi/pm8001/pm8001_ctl.c
+++ b/drivers/scsi/pm8001/pm8001_ctl.c
@@ -617,11 +617,11 @@ static int pm8001_update_flash(struct pm8001_hba_info *pm8001_ha)
 
                pm8001_ha->nvmd_completion = &completion;
                ret = PM8001_CHIP_DISP->fw_flash_update_req(pm8001_ha, payload);
+               if (ret)
+                       break;
                wait_for_completion(&completion);
-               if (ret || (fwControl->retcode > FLASH_UPDATE_IN_PROGRESS)) {
+               if (fwControl->retcode > FLASH_UPDATE_IN_PROGRESS) {
                        ret = fwControl->retcode;
-                       kfree(ioctlbuffer);
-                       ioctlbuffer = NULL;
                        break;
                }
        }