Commit 793d2a05 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki Committed by Guenter Roeck
Browse files

hwmon: (acpi_power_meter) Check ACPI_COMPANION() against NULL 



Every platform driver can be forced to match a device that doesn't match
its list of device IDs because of device_match_driver_override(), so
platform drivers that rely on the existence of a device's ACPI companion
object need to verify its presence.

Accordingly, add a requisite ACPI_COMPANION() check against NULL to the
acpi_power_meter hwmon driver.

Fixes: afc6c4ae ("hwmon: (acpi_power_meter) Convert ACPI driver to a platform one")
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
Link: https://lore.kernel.org/r/5068745.GXAFRqVoOG@rafael.j.wysocki


Signed-off-by: default avatarGuenter Roeck <linux@roeck-us.net>
parent 5d691905

drivers/hwmon/acpi_power_meter.c

+5 −1
Original line number Diff line number Diff line
@@ -884,10 +884,14 @@ static void acpi_power_meter_notify(acpi_handle handle, u32 event, void *data) 


static int acpi_power_meter_probe(struct platform_device *pdev)

{

	struct acpi_device *device = ACPI_COMPANION(&pdev->dev);

	struct acpi_power_meter_resource *resource;

	struct acpi_device *device;

	int res;



	device = ACPI_COMPANION(&pdev->dev);

	if (!device)

		return -ENODEV;



	resource = kzalloc_obj(*resource);

	if (!resource)

		return -ENOMEM;