Commit d5e1670a authored by Shuah Khan's avatar Shuah Khan Committed by Rafael J. Wysocki

PM: Avoid calling kfree() under spinlock in dev_pm_put_subsys_data()

Fix dev_pm_put_subsys_data() so that it doesn't call kfree() under
a spinlock and make it return 1 whenever it leaves NULL
power.subsys_data (regardless of the reason).
Signed-off-by: default avatarShuah Khan <shuah.kh@samsung.com>
Reviewed-by: default avatarPavel Machek <pavel@ucw.cz>
Acked-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent f722406f
...@@ -61,24 +61,24 @@ EXPORT_SYMBOL_GPL(dev_pm_get_subsys_data); ...@@ -61,24 +61,24 @@ EXPORT_SYMBOL_GPL(dev_pm_get_subsys_data);
int dev_pm_put_subsys_data(struct device *dev) int dev_pm_put_subsys_data(struct device *dev)
{ {
struct pm_subsys_data *psd; struct pm_subsys_data *psd;
int ret = 0; int ret = 1;
spin_lock_irq(&dev->power.lock); spin_lock_irq(&dev->power.lock);
psd = dev_to_psd(dev); psd = dev_to_psd(dev);
if (!psd) { if (!psd)
ret = -EINVAL;
goto out; goto out;
}
if (--psd->refcount == 0) { if (--psd->refcount == 0) {
dev->power.subsys_data = NULL; dev->power.subsys_data = NULL;
kfree(psd); } else {
ret = 1; psd = NULL;
ret = 0;
} }
out: out:
spin_unlock_irq(&dev->power.lock); spin_unlock_irq(&dev->power.lock);
kfree(psd);
return ret; return ret;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment