Merge "input: qpnp-power-on: set boot_reason when system-reset exists" into msm-4.9 (f3439b06) · Commits · e / devices / android_kernel_fairphone_FP3

drivers/input/misc/qpnp-power-on.c

+3 −2

Original line number	Diff line number	Diff line
		@@ -2123,6 +2123,9 @@ static int qpnp_pon_probe(struct platform_device *pdev)
		return rc;
		}

		if (sys_reset)
		boot_reason = ffs(pon_sts);

		index = ffs(pon_sts) - 1;
		cold_boot = !qpnp_pon_is_warm_reset();
		if (index >= ARRAY_SIZE(qpnp_pon_reason) \|\| index < 0) {
		@@ -2350,8 +2353,6 @@ static int qpnp_pon_probe(struct platform_device *pdev)
		list_add(&pon->list, &spon_dev_list);
		spin_unlock_irqrestore(&spon_list_slock, flags);
		pon->is_spon = true;
		} else {
		boot_reason = ffs(pon_sts);
		}

		/* config whether store the hard reset reason */