Merge "qcom: pil-msa: Move freeing DMA memory till after MBA authenticates image" (77da3567) · Commits · e / devices / android_kernel_sony_msm8994

drivers/soc/qcom/pil-msa.c

+4 −2

Original line number	Original line	Diff line number	Diff line
	@@ -351,8 +351,6 @@ int pil_mss_reset_load_mba(struct pil_desc *pil)
	goto err_mss_reset;		goto err_mss_reset;
	}		}

	/* The MBA doesn't run from DDR, free the memory now. */
	dma_free_coherent(pil->dev, MBA_SIZE, drv->mba_virt, drv->mba_phys);
	release_firmware(fw);		release_firmware(fw);

	return 0;		return 0;
	@@ -459,6 +457,10 @@ static int pil_msa_mba_auth(struct pil_desc *pil)
	ret = -EINVAL;		ret = -EINVAL;
	}		}

			if (drv->q6->mba_virt)
			/* Reclaim MBA memory. */
			dma_free_coherent(pil->dev, MBA_SIZE, drv->q6->mba_virt,
			drv->q6->mba_phys);
	return ret;		return ret;
	}		}