summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKyle Yan <kyan@codeaurora.org>2017-01-06 14:04:26 -0800
committerKyle Yan <kyan@codeaurora.org>2017-01-16 15:10:06 -0800
commit72354e375b2d0098961700b2dd01e7ebd187ec95 (patch)
tree4c21bc4d8955aae1f978a9ae49012224cc20cb02
parent2326bcf687b715c7773270ba9cc6aaf5fedc1dbb (diff)
soc: qcom: Return actual return code when piltz_resc_init fails
Propagate error code upwards when piltz_resc_init fails. Previous return prevented probe from retrying when piltz_resc_init returns -EPROBE_DEFER. Change-Id: I217f13eb4bff321ae1b7583f5d2614b6c9589987 Signed-off-by: Kyle Yan <kyan@codeaurora.org>
-rw-r--r--drivers/soc/qcom/subsys-pil-tz.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/soc/qcom/subsys-pil-tz.c b/drivers/soc/qcom/subsys-pil-tz.c
index 769a683e3d8d..c6531de48f65 100644
--- a/drivers/soc/qcom/subsys-pil-tz.c
+++ b/drivers/soc/qcom/subsys-pil-tz.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2014-2016, The Linux Foundation. All rights reserved.
+/* Copyright (c) 2014-2017, The Linux Foundation. All rights reserved.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 and
@@ -1043,7 +1043,7 @@ static int pil_tz_driver_probe(struct platform_device *pdev)
if (!d->subsys_desc.no_auth) {
rc = piltz_resc_init(pdev, d);
if (rc)
- return -ENOENT;
+ return rc;
rc = of_property_read_u32(pdev->dev.of_node, "qcom,pas-id",
&d->pas_id);