lkml.org 
[lkml]   [2018]   [Sep]   [7]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL 4.18 72/88] soc: qcom: smem: Correct check for global partition
    Date
    From: Bjorn Andersson <bjorn.andersson@linaro.org>

    [ Upstream commit 0b65c59e3a5475895c93ea5f130597db16b8abf6 ]

    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: 11d2e7edac6a ("soc: qcom: smem: check sooner in qcom_smem_set_global_partition()")
    Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>
    Reviewed-by: Alex Elder <elder@linaro.org>
    Signed-off-by: Andy Gross <andy.gross@linaro.org>
    Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
    ---
    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);
    --
    2.17.1
    \
     
     \ /
      Last update: 2018-09-07 02:57    [W:5.012 / U:0.144 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site