summaryrefslogtreecommitdiffstats
path: root/drivers/platform/x86
diff options
context:
space:
mode:
authorKrzysztof Kozlowski <k.kozlowski@samsung.com>2015-03-12 08:43:59 +0100
committerSasha Levin <sasha.levin@oracle.com>2015-05-17 19:11:54 -0400
commit29037bcf2d8bf828d253a2e31339c3c04a172a9c (patch)
tree22c827eacca8b3a8643e8e6c6c4b1c3883b4b835 /drivers/platform/x86
parent502e02465516f6987e89b564051d82a9b6498377 (diff)
downloadlinux-stable-29037bcf2d8bf828d253a2e31339c3c04a172a9c.tar.gz
linux-stable-29037bcf2d8bf828d253a2e31339c3c04a172a9c.tar.bz2
linux-stable-29037bcf2d8bf828d253a2e31339c3c04a172a9c.zip
compal-laptop: Fix leaking hwmon device
[ Upstream commit ad774702f1705c04e5fa492b793d8d477a504fa6 ] The commit c2be45f09bb0 ("compal-laptop: Use devm_hwmon_device_register_with_groups") wanted to change the registering of hwmon device to resource-managed version. It mostly did it except the main thing - it forgot to use devm-like function so the hwmon device leaked after device removal or probe failure. Signed-off-by: Krzysztof Kozlowski <k.kozlowski@samsung.com> Fixes: c2be45f09bb0 ("compal-laptop: Use devm_hwmon_device_register_with_groups") Cc: <stable@vger.kernel.org> Acked-by: Guenter Roeck <linux@roeck-us.net> Acked-by: Darren Hart <dvhart@linux.intel.com> Signed-off-by: Sebastian Reichel <sre@kernel.org> Signed-off-by: Sasha Levin <sasha.levin@oracle.com>
Diffstat (limited to 'drivers/platform/x86')
-rw-r--r--drivers/platform/x86/compal-laptop.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/platform/x86/compal-laptop.c b/drivers/platform/x86/compal-laptop.c
index 26bfd7bb5c13..da5e7b8e4519 100644
--- a/drivers/platform/x86/compal-laptop.c
+++ b/drivers/platform/x86/compal-laptop.c
@@ -1027,9 +1027,9 @@ static int compal_probe(struct platform_device *pdev)
if (err)
return err;
- hwmon_dev = hwmon_device_register_with_groups(&pdev->dev,
- "compal", data,
- compal_hwmon_groups);
+ hwmon_dev = devm_hwmon_device_register_with_groups(&pdev->dev,
+ "compal", data,
+ compal_hwmon_groups);
if (IS_ERR(hwmon_dev)) {
err = PTR_ERR(hwmon_dev);
goto remove;