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

Commit 0b65c59e authored by Bjorn Andersson's avatar Bjorn Andersson Committed by Andy Gross
Browse files

soc: qcom: smem: Correct check for global partition 



The moved check for the global partition ended up in the wrong place and I
failed to spot this in my review. This moves it to the correct place.

Fixes: 11d2e7ed ("soc: qcom: smem: check sooner in qcom_smem_set_global_partition()")
Signed-off-by: default avatarBjorn Andersson <bjorn.andersson@linaro.org>
Reviewed-by: default avatarAlex Elder <elder@linaro.org>
Signed-off-by: default avatarAndy Gross <andy.gross@linaro.org>
parent ce397d21

drivers/soc/qcom/smem.c

+5 −5
Original line number Diff line number Diff line
@@ -364,11 +364,6 @@ static int qcom_smem_alloc_private(struct qcom_smem *smem, 
	end = phdr_to_last_uncached_entry(phdr);

	cached = phdr_to_last_cached_entry(phdr);



	if (smem->global_partition) {

		dev_err(smem->dev, "Already found the global partition\n");

		return -EINVAL;

	}



	while (hdr < end) {

		if (hdr->canary != SMEM_PRIVATE_CANARY)

			goto bad_canary;
@@ -736,6 +731,11 @@ static int qcom_smem_set_global_partition(struct qcom_smem *smem) 
	bool found = false;

	int i;



	if (smem->global_partition) {

		dev_err(smem->dev, "Already found the global partition\n");

		return -EINVAL;

	}



	ptable = qcom_smem_get_ptable(smem);

	if (IS_ERR(ptable))

		return PTR_ERR(ptable);