Commit fe05ca53 authored by Huisong Li's avatar Huisong Li Committed by Lifeng Zheng
Browse files

hwmon: (acpi_power_meter) Fix fail to load module on platform without _PMD method 

mainline inclusion
from mainline-v6.12-rc7
commit fabb1f813ec05975fd3428e72a62ef9f855fd3b4
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/IBVB4K
CVE: NA

Reference: https://web.git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=fabb1f813ec05975fd3428e72a62ef9f855fd3b4



---------------------------------------------------------------------

According to the ACPI specification, the _PMD method is optional. The
acpi_power_meter driver shouldn't fail to load if the platform has no
_PMD method.

Signed-off-by: default avatarHuisong Li <lihuisong@huawei.com>
Message-ID: <20241112021228.22914-1-lihuisong@huawei.com>
[groeck: Reworded commit description]
Signed-off-by: default avatarGuenter Roeck <linux@roeck-us.net>
Signed-off-by: default avatarXinghai Cen <cenxinghai@h-partners.com>
parent af590008

drivers/hwmon/acpi_power_meter.c

+2 −1
Original line number Diff line number Diff line
@@ -680,8 +680,9 @@ static int setup_attrs(struct acpi_power_meter_resource *resource) 
{

	int res = 0;



	/* _PMD method is optional. */

	res = read_domain_devices(resource);

	if (res)

	if (res != -ENODEV)

		return res;



	if (resource->caps.flags & POWER_METER_CAN_MEASURE) {