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

1 files changed, 5 insertions, 4 deletions

diff --git a/drivers/soc/qcom/smsm.c b/drivers/soc/qcom/smsm.c
index d0337b2a71c8..dc540ea92e9d 100644
--- a/drivers/soc/qcom/smsm.c
+++ b/drivers/soc/qcom/smsm.c
@@ -439,14 +439,15 @@ static int smsm_get_size_info(struct qcom_smsm *smsm)
         } *info;
 
         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");
                 smsm->num_entries = SMSM_DEFAULT_NUM_ENTRIES;
                 smsm->num_hosts = SMSM_DEFAULT_NUM_HOSTS;
                 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;