diff options
| author | Linux Build Service Account <lnxbuild@quicinc.com> | 2017-08-16 01:55:59 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2017-08-16 01:55:59 -0700 |
| commit | 3fb04f53dd0f2e2be810b8e4f1029f4ea52cb51a (patch) | |
| tree | b9d6077668e223aa64404521c70454230d8664c7 | |
| parent | e7ab41f40cd5d39f8290ea4373876623d18a3342 (diff) | |
| parent | 7380bf04bafcfbfde3d8b2cfaa9c5e8768bb2ac7 (diff) | |
Merge "misc: qseecom: Support qseecom deferred probing" into dev/msm-4.4-8996au
| -rw-r--r-- | drivers/misc/qseecom.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/misc/qseecom.c b/drivers/misc/qseecom.c index 7d09f22d3bc6..763cb5e8d52e 100644 --- a/drivers/misc/qseecom.c +++ b/drivers/misc/qseecom.c @@ -8448,7 +8448,11 @@ static int qseecom_probe(struct platform_device *pdev) qseecom.ion_clnt = msm_ion_client_create("qseecom-kernel"); if (IS_ERR_OR_NULL(qseecom.ion_clnt)) { pr_err("Ion client cannot be created\n"); - rc = -ENOMEM; + + if (qseecom.ion_clnt != ERR_PTR(-EPROBE_DEFER)) + rc = -ENOMEM; + else + rc = -EPROBE_DEFER; goto exit_del_cdev; } |