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

Commit a6809053 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: pil: Do not panic on powerup if the system is rebooting"

parents 79360db9 2b877e52
Loading
Loading
Loading
Loading
+7 −4
Original line number Diff line number Diff line
@@ -686,14 +686,17 @@ static int subsystem_powerup(struct subsys_device *dev, void *data)
	if (ret < 0) {
		notify_each_subsys_device(&dev, 1, SUBSYS_POWERUP_FAILURE,
								NULL);
		if (!dev->desc->ignore_ssr_failure)
		if (system_state == SYSTEM_RESTART
			|| system_state == SYSTEM_POWER_OFF)
			WARN(1, "SSR aborted: %s, system reboot/shutdown is under way\n",
				name);
		else if (!dev->desc->ignore_ssr_failure)
			panic("[%s:%d]: Powerup error: %s!",
				current->comm, current->pid, name);
		else {
		else
			pr_err("Powerup failure on %s\n", name);
		return ret;
	}
	}
	enable_all_irqs(dev);

	ret = wait_for_err_ready(dev);