Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cd022c28 authored by Kyle Yan's avatar Kyle Yan Committed by Gerrit - the friendly Code Review server
Browse files

Merge "soc: qcom: Return actual return code when piltz_resc_init fails" into msm-4.8

parents d3f8aae3 3d6600c5

drivers/soc/qcom/subsys-pil-tz.c

+2 −2
Original line number Diff line number Diff line 
/* 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
@@ -1039,7 +1039,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);