diff options
| author | Hans de Goede <hdegoede@redhat.com> | 2023-01-30 14:25:54 +0100 |
|---|---|---|
| committer | Hans de Goede <hdegoede@redhat.com> | 2023-01-30 14:30:57 +0100 |
| commit | e0c40529ff942a985eb0f3dacf18d35ee4dbb03d (patch) | |
| tree | 3a9900c1c444d93052b4de56325a66e426e3effa /drivers/platform/x86/amd/pmf | |
| parent | platform/x86/amd/pmf: Fix to update SPS thermals when power supply change (diff) | |
| download | linux-e0c40529ff942a985eb0f3dacf18d35ee4dbb03d.tar.xz linux-e0c40529ff942a985eb0f3dacf18d35ee4dbb03d.zip | |
platform/x86/amd/pmf: Ensure mutexes are initialized before use
As soon as the first handler or sysfs file is registered
the mutex may get used.
Move the initialization to before any handler registration /
sysfs file creation.
Likewise move the destruction of the mutex to after all
the de-initialization is done.
Fixes: da5ce22df5fe ("platform/x86/amd/pmf: Add support for PMF core layer")
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Link: https://lore.kernel.org/r/20230130132554.696025-1-hdegoede@redhat.com
Diffstat (limited to 'drivers/platform/x86/amd/pmf')
| -rw-r--r-- | drivers/platform/x86/amd/pmf/core.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/drivers/platform/x86/amd/pmf/core.c b/drivers/platform/x86/amd/pmf/core.c index c9f7bcef4ac8..da23639071d7 100644 --- a/drivers/platform/x86/amd/pmf/core.c +++ b/drivers/platform/x86/amd/pmf/core.c @@ -385,6 +385,9 @@ static int amd_pmf_probe(struct platform_device *pdev) if (!dev->regbase) return -ENOMEM; + mutex_init(&dev->lock); + mutex_init(&dev->update_mutex); + apmf_acpi_init(dev); platform_set_drvdata(pdev, dev); amd_pmf_init_features(dev); @@ -394,8 +397,6 @@ static int amd_pmf_probe(struct platform_device *pdev) dev->pwr_src_notifier.notifier_call = amd_pmf_pwr_src_notify_call; power_supply_reg_notifier(&dev->pwr_src_notifier); - mutex_init(&dev->lock); - mutex_init(&dev->update_mutex); dev_info(dev->dev, "registered PMF device successfully\n"); return 0; @@ -406,11 +407,11 @@ static int amd_pmf_remove(struct platform_device *pdev) struct amd_pmf_dev *dev = platform_get_drvdata(pdev); power_supply_unreg_notifier(&dev->pwr_src_notifier); - mutex_destroy(&dev->lock); - mutex_destroy(&dev->update_mutex); amd_pmf_deinit_features(dev); apmf_acpi_deinit(dev); amd_pmf_dbgfs_unregister(dev); + mutex_destroy(&dev->lock); + mutex_destroy(&dev->update_mutex); kfree(dev->buf); return 0; } |