Merge "misc: qseecom: Support qseecom deferred probing"

This commit is contained in:
Linux Build Service Account 2017-07-26 08:44:49 -07:00 committed by Gerrit - the friendly Code Review server
commit 67edc020df

View file

@ -8530,7 +8530,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;
}