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

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

Merge "qcom: ssr: Unlock the ssr_order mutex before returning"

parents ab7b2e21 3a6797bf

drivers/soc/qcom/subsystem_restart.c

+8 −3
Original line number Diff line number Diff line
@@ -1177,9 +1177,11 @@ static struct subsys_soc_restart_order *ssr_parse_restart_orders(struct 
		}



		if (num == count && tmp->count == count)

			return tmp;

		else if (num)

			return ERR_PTR(-EINVAL);

			goto err;

		else if (num) {

			tmp = ERR_PTR(-EINVAL);

			goto err;

		}

	}



	order->count = count;
@@ -1191,6 +1193,9 @@ static struct subsys_soc_restart_order *ssr_parse_restart_orders(struct 
	mutex_unlock(&ssr_order_mutex);



	return order;

err:

	mutex_unlock(&ssr_order_mutex);

	return tmp;

}



static int __get_gpio(struct subsys_desc *desc, const char *prop,