On 06/25/2018 03:06 PM, Bjorn Andersson wrote:
> 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.
Whoops. That's strange. The description explains what it was supposed
to do. And what got committed is actually what I sent... Hmmm. I bet
quilt did a fuzzy refresh and I neglected to verify the result was correct.
Or more likely, I just did something stupid.
In any case, this looks good.
Reviewed-by: Alex Elder <elder@xxxxxxxxxx>
>
> Fixes: 11d2e7edac6a ("soc: qcom: smem: check sooner in qcom_smem_set_global_partition()")
> Signed-off-by: Bjorn Andersson <bjorn.andersson@xxxxxxxxxx>
> ---
> drivers/soc/qcom/smem.c | 10 +++++-----
> 1 file changed, 5 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/soc/qcom/smem.c b/drivers/soc/qcom/smem.c
> index 70b2ee80d6bd..bf4bd71ab53f 100644
> --- a/drivers/soc/qcom/smem.c
> +++ b/drivers/soc/qcom/smem.c
> @@ -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);
>
--
To unsubscribe from this list: send the line "unsubscribe linux-soc" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
