summaryrefslogtreecommitdiffstats
path: root/drivers/base/dd.c
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2021-04-05 08:51:37 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2021-04-05 08:51:37 +0200
commitb20e82939034a79e9af50853d63163fe21f205a9 (patch)
tree7cfcf453c08e9b7e00530cfedc043eea23b0f367 /drivers/base/dd.c
parentf7514a6630166a7b566dee9b1af2e87e431959be (diff)
parente49d033bddf5b565044e2abe4241353959bc9120 (diff)
downloadlinux-b20e82939034a79e9af50853d63163fe21f205a9.tar.bz2
Merge 5.12-rc6 into driver-core-next
We need the driver core fixes in here as well. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/base/dd.c')
-rw-r--r--drivers/base/dd.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/base/dd.c b/drivers/base/dd.c
index 20b69b5e0e91..33fda3462aa0 100644
--- a/drivers/base/dd.c
+++ b/drivers/base/dd.c
@@ -96,6 +96,9 @@ static void deferred_probe_work_func(struct work_struct *work)
get_device(dev);
+ kfree(dev->p->deferred_probe_reason);
+ dev->p->deferred_probe_reason = NULL;
+
/*
* Drop the mutex while probing each device; the probe path may
* manipulate the deferred list