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

Commit 1b58d242 authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "qcom/watchdog_v2: Disable watchdog before booting crash kernel"

parents a49d8a3c 436b8195
Loading
Loading
Loading
Loading
+2 −2
Original line number Diff line number Diff line
/* Copyright (c) 2012-2019, The Linux Foundation. All rights reserved.
/* Copyright (c) 2012-2020, The Linux Foundation. All rights reserved.
 *
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License version 2 and
@@ -197,7 +197,7 @@ static int panic_wdog_handler(struct notifier_block *this,
{
	struct msm_watchdog_data *wdog_dd = container_of(this,
				struct msm_watchdog_data, panic_blk);
	if (panic_timeout == 0) {
	if (panic_timeout == 0 || crash_kexec_post_notifiers) {
		__raw_writel(0, wdog_dd->base + WDT0_EN);
		/* Make sure watchdog is enabled before notifying the caller */
		mb();