| commit | 0e64123141f3854e695eb4924d82b52856691466 | [log] [tgz] |
|---|---|---|
| author | Olivier Deprez <olivier.deprez@arm.com> | Thu Sep 23 10:07:05 2021 +0200 |
| committer | Olivier Deprez <olivier.deprez@arm.com> | Tue Oct 26 16:50:53 2021 +0100 |
| tree | 9f79e140db584f9b107f4e33373a0075983df1f4 | |
| parent | 98854e9675dc7d951fa9c4e10d9c9d230c54bde6 [diff] [blame] |
Update Linux to v5.4.148 Sourced from [1] [1] https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.4.148.tar.gz Change-Id: Ib3d26c5ba9b022e2e03533005c4fed4d7c30b61b Signed-off-by: Olivier Deprez <olivier.deprez@arm.com>
diff --git a/drivers/hwmon/acpi_power_meter.c b/drivers/hwmon/acpi_power_meter.c index 4cf2545..740ac0a 100644 --- a/drivers/hwmon/acpi_power_meter.c +++ b/drivers/hwmon/acpi_power_meter.c
@@ -883,7 +883,7 @@ res = setup_attrs(resource); if (res) - goto exit_free; + goto exit_free_capability; resource->hwmon_dev = hwmon_device_register(&device->dev); if (IS_ERR(resource->hwmon_dev)) { @@ -896,6 +896,8 @@ exit_remove: remove_attrs(resource); +exit_free_capability: + free_capabilities(resource); exit_free: kfree(resource); exit: