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

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

Merge "hwmon: qpnp-adc-voltage: Update condition for reading temp through VADC"

parents c7a9261b 39afd73a

drivers/hwmon/qpnp-adc-voltage.c

+3 −2
Original line number Diff line number Diff line 
/* Copyright (c) 2012-2015, The Linux Foundation. All rights reserved.

/* Copyright (c) 2012-2016, 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
@@ -2479,6 +2479,7 @@ static int qpnp_vadc_get_temp(struct thermal_zone_device *thermal, 
	rc = qpnp_vadc_read(vadc,

				vadc_therm->vadc_channel, &result);

	if (rc) {

		if (rc != -EPROBE_DEFER)

			pr_err("VADC read error with %d\n", rc);

		return rc;

	}