Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 31d05e5b authored by Tomas Henzl's avatar Tomas Henzl Committed by Christoph Hellwig
Browse files

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: default avatarTomas Henzl <thenzl@redhat.com>
Acked-by: default avatarSuresh Thiagarajan <Suresh.Thiagarajan@pmcs.com>
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
parent 9422e864

drivers/scsi/pm8001/pm8001_ctl.c

+3 −3
Original line number Diff line number Diff line
@@ -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;

		}

	}