mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-12 11:36:35 +00:00
base: dd: don't remove driver_data in -EPROBE_DEFER case
the driver_data may be used for sanity check, it fails the probe() if driver_data is NULL after it is re-triggered. for example, soc_probe() in sound/soc/soc-core.c Signed-off-by: Yi Zhang <yizhang_hust@163.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
e4234a1fc3
commit
ded9db380d
1 changed files with 2 additions and 1 deletions
|
@ -402,7 +402,8 @@ static int really_probe(struct device *dev, struct device_driver *drv)
|
||||||
devres_release_all(dev);
|
devres_release_all(dev);
|
||||||
driver_sysfs_remove(dev);
|
driver_sysfs_remove(dev);
|
||||||
dev->driver = NULL;
|
dev->driver = NULL;
|
||||||
dev_set_drvdata(dev, NULL);
|
if (ret != -EPROBE_DEFER)
|
||||||
|
dev_set_drvdata(dev, NULL);
|
||||||
if (dev->pm_domain && dev->pm_domain->dismiss)
|
if (dev->pm_domain && dev->pm_domain->dismiss)
|
||||||
dev->pm_domain->dismiss(dev);
|
dev->pm_domain->dismiss(dev);
|
||||||
pm_runtime_reinit(dev);
|
pm_runtime_reinit(dev);
|
||||||
|
|
Loading…
Reference in a new issue