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

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

Merge "power: reset: Fix handling of OEM commands"

parents 8d030466 ea868211

drivers/power/reset/msm-poweroff.c

+5 −2
Original line number Diff line number Diff line
@@ -209,8 +209,11 @@ static void msm_restart_prepare(const char *cmd) 
			__raw_writel(0x77665503, restart_reason);

		} else if (!strncmp(cmd, "oem-", 4)) {

			unsigned long code;

			code = kstrtoul(cmd + 4, 16, NULL) & 0xff;

			__raw_writel(0x6f656d00 | code, restart_reason);

			int ret;

			ret = kstrtoul(cmd + 4, 16, &code);

			if (!ret)

				__raw_writel(0x6f656d00 | (code & 0xff),

					     restart_reason);

		} else if (!strncmp(cmd, "edl", 3)) {

			enable_emergency_dload_mode();

		} else {