diff options
| author | Andrey Zhizhikin <andrey.zhizhikin@leica-geosystems.com> | 2021-01-11 09:09:08 +0000 |
|---|---|---|
| committer | Andrey Zhizhikin <andrey.zhizhikin@leica-geosystems.com> | 2021-01-11 09:09:08 +0000 |
| commit | 9e9365cbcfd726222a68dae0b08d25767877aec9 (patch) | |
| tree | 1946d701e19079fb1f99ac9f3fe263bc52091c15 /drivers/base | |
| parent | 4f2631b022d843c1f2a5d34eae2fd98927a1a6c7 (diff) | |
| parent | 85b0841aab15c12948af951d477183ab3df7de14 (diff) | |
Merge tag 'v5.4.71' into 5.4-2.3.x-imx
This is the 5.4.71 stable release
Signed-off-by: Andrey Zhizhikin <andrey.zhizhikin@leica-geosystems.com>
Diffstat (limited to 'drivers/base')
| -rw-r--r-- | drivers/base/dd.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/base/dd.c b/drivers/base/dd.c index f8746aa3c14b..c9b308229335 100644 --- a/drivers/base/dd.c +++ b/drivers/base/dd.c @@ -518,7 +518,8 @@ static int really_probe(struct device *dev, struct device_driver *drv) drv->bus->name, __func__, drv->name, dev_name(dev)); if (!list_empty(&dev->devres_head)) { dev_crit(dev, "Resources present before probing\n"); - return -EBUSY; + ret = -EBUSY; + goto done; } re_probe: @@ -639,7 +640,7 @@ pinctrl_bind_failed: ret = 0; done: atomic_dec(&probe_count); - wake_up(&probe_waitqueue); + wake_up_all(&probe_waitqueue); return ret; } |