Merge "thermal: qcom-spmi-temp-alarm: Don't suppress negative temp" (2601fc56) · Commits · e / devices / android_kernel_fairphone_FP5

drivers/thermal/qcom/qcom-spmi-temp-alarm.c

+2 −2

Original line number	Diff line number	Diff line
		// SPDX-License-Identifier: GPL-2.0-only
		/*
		* Copyright (c) 2011-2015, 2017, The Linux Foundation. All rights reserved.
		* Copyright (c) 2011-2015, 2017, 2020, The Linux Foundation. All rights reserved.
		*/

		#include <linux/bitops.h>
		@@ -212,7 +212,7 @@ static int qpnp_tm_get_temp(void data, int temp)
		chip->temp = mili_celsius;
		}

		*temp = chip->temp < 0 ? 0 : chip->temp;
		*temp = chip->temp;

		return 0;
		}