Qualcomm ARM Based Driver Updates for v4.13
* Improve QCOM SMSM error handling -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQIcBAABAgAGBQJZSpXvAAoJEFKiBbHx2RXVkcsP/38gAqsc+LthSM22WNuEgFzO Si6BmvptWA4Hx88nec2czPvW3MxlT96ywr0VeBrCkayqUz5q+rUeFlNXgWL1/xHt 86NoBKZ5fo8DLDbpSjTt6dIGrRTQ4DBNRVaDD8iINbEsh5Pl5v3flQZzWQhXvmvp vA1kIY/SsmGkf8Zemt8jibEaEGPUilLu+3AH4PFkKi3MKEUiGBWeu0ldiNPa+VTi bS9dNOhz+kX9LYwyx+YwQEQ49E6M05MAD4M9JZ2NMdxeah3hGXHwyuW9Zt1cC8si i8Jb1FoNA37Y7ojtObu4C+eB81SZaAQwoItEWqJwzkh8Ux5tChwOLjGhELygHBTy OaAG1LQnzgZRL5l4CsSSSBDW/FnIC1Qua59HejyiFbcfv5BMXiG4kD1CuBDh4CIC HIvRIZpPCtB/fRF22U8kkbkfEy58+bE/sGM3Xg+1PtnSj82trJioJabWske+3WSb AiI2loQg3ln7h12AMBOYnsuDnzcVCiq3K6gDgMJNFucIx++aZjbE6SM+fCCisf0y XdVgbHJ90TCJWm/L3PhAvLauT4XUwlXSoCT1CVJmCY+ToA1btQcL6ZIXmkqVGukR ItMmJgtXhEtQ26rqiFB/F0AnhyBlq8jxt2nY2vvn4Z6tjAltDsrBj8A7lv1rL0vu zaJxaFOIWjeunO0WnkNr =2N22 -----END PGP SIGNATURE----- Merge tag 'qcom-drivers-for-4.13' of git://git.kernel.org/pub/scm/linux/kernel/git/agross/linux into next/drivers Pull "Qualcomm ARM Based Driver Updates for v4.13" from Andy Gross: * Improve QCOM SMSM error handling * tag 'qcom-drivers-for-4.13' of git://git.kernel.org/pub/scm/linux/kernel/git/agross/linux: soc: qcom: smsm: Improve error handling, quiesce probe deferral
This commit is contained in:
commit
4312fc34f6
@ -439,14 +439,15 @@ static int smsm_get_size_info(struct qcom_smsm *smsm)
|
|||||||
} *info;
|
} *info;
|
||||||
|
|
||||||
info = qcom_smem_get(QCOM_SMEM_HOST_ANY, SMEM_SMSM_SIZE_INFO, &size);
|
info = qcom_smem_get(QCOM_SMEM_HOST_ANY, SMEM_SMSM_SIZE_INFO, &size);
|
||||||
if (PTR_ERR(info) == -ENOENT || size != sizeof(*info)) {
|
if (IS_ERR(info) && PTR_ERR(info) != -ENOENT) {
|
||||||
|
if (PTR_ERR(info) != -EPROBE_DEFER)
|
||||||
|
dev_err(smsm->dev, "unable to retrieve smsm size info\n");
|
||||||
|
return PTR_ERR(info);
|
||||||
|
} else if (IS_ERR(info) || size != sizeof(*info)) {
|
||||||
dev_warn(smsm->dev, "no smsm size info, using defaults\n");
|
dev_warn(smsm->dev, "no smsm size info, using defaults\n");
|
||||||
smsm->num_entries = SMSM_DEFAULT_NUM_ENTRIES;
|
smsm->num_entries = SMSM_DEFAULT_NUM_ENTRIES;
|
||||||
smsm->num_hosts = SMSM_DEFAULT_NUM_HOSTS;
|
smsm->num_hosts = SMSM_DEFAULT_NUM_HOSTS;
|
||||||
return 0;
|
return 0;
|
||||||
} else if (IS_ERR(info)) {
|
|
||||||
dev_err(smsm->dev, "unable to retrieve smsm size info\n");
|
|
||||||
return PTR_ERR(info);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
smsm->num_entries = info->num_entries;
|
smsm->num_entries = info->num_entries;
|
||||||
|
Loading…
Reference in New Issue
Block a user