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: 11d2e7edac
("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>
This commit is contained in:
Родитель
ce397d215c
Коммит
0b65c59e3a
|
@ -364,11 +364,6 @@ static int qcom_smem_alloc_private(struct qcom_smem *smem,
|
||||||
end = phdr_to_last_uncached_entry(phdr);
|
end = phdr_to_last_uncached_entry(phdr);
|
||||||
cached = phdr_to_last_cached_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) {
|
while (hdr < end) {
|
||||||
if (hdr->canary != SMEM_PRIVATE_CANARY)
|
if (hdr->canary != SMEM_PRIVATE_CANARY)
|
||||||
goto bad_canary;
|
goto bad_canary;
|
||||||
|
@ -736,6 +731,11 @@ static int qcom_smem_set_global_partition(struct qcom_smem *smem)
|
||||||
bool found = false;
|
bool found = false;
|
||||||
int i;
|
int i;
|
||||||
|
|
||||||
|
if (smem->global_partition) {
|
||||||
|
dev_err(smem->dev, "Already found the global partition\n");
|
||||||
|
return -EINVAL;
|
||||||
|
}
|
||||||
|
|
||||||
ptable = qcom_smem_get_ptable(smem);
|
ptable = qcom_smem_get_ptable(smem);
|
||||||
if (IS_ERR(ptable))
|
if (IS_ERR(ptable))
|
||||||
return PTR_ERR(ptable);
|
return PTR_ERR(ptable);
|
||||||
|
|
Загрузка…
Ссылка в новой задаче