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

Commit 390068ec authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "soc: qcom: glink_ssr: Add support for ss_info without notify edges"

parents ec256930 9d9cf559

drivers/soc/qcom/glink_ssr.c

+2 −9
Original line number Original line Diff line number Diff line
@@ -965,13 +965,6 @@ static int glink_ssr_probe(struct platform_device *pdev) 
	key = "qcom,notify-edges";

	key = "qcom,notify-edges";

	while (true) {

	while (true) {

		phandle_node = of_parse_phandle(node, key, phandle_index++);

		phandle_node = of_parse_phandle(node, key, phandle_index++);

		if (!phandle_node && phandle_index == 0) {

			GLINK_SSR_ERR(

				"<SSR> %s: qcom,notify-edges is not present",

				__func__);

			ret = -ENODEV;

			goto notify_edges_not_present;

		}





		if (!phandle_node)

		if (!phandle_node)

			break;

			break;
@@ -983,7 +976,7 @@ static int glink_ssr_probe(struct platform_device *pdev) 
				"<SSR> %s: Could not allocate subsys_info_leaf\n",

				"<SSR> %s: Could not allocate subsys_info_leaf\n",

				__func__);

				__func__);

			ret = -ENOMEM;

			ret = -ENOMEM;

			goto notify_edges_not_present;

			goto notify_edges_no_memory;

		}

		}





		subsys_name = of_get_property(phandle_node, "label", NULL);

		subsys_name = of_get_property(phandle_node, "label", NULL);
@@ -1026,7 +1019,7 @@ static int glink_ssr_probe(struct platform_device *pdev) 
	list_del(&ss_info->subsystem_list_node);

	list_del(&ss_info->subsystem_list_node);

invalid_dt_node:

invalid_dt_node:

	kfree(ss_info_leaf);

	kfree(ss_info_leaf);

notify_edges_not_present:

notify_edges_no_memory:

	subsys_notif_unregister_notifier(handle, &nb->nb);

	subsys_notif_unregister_notifier(handle, &nb->nb);

	delete_ss_info_notify_list(ss_info);

	delete_ss_info_notify_list(ss_info);

nb_registration_fail:

nb_registration_fail: