Skip to content

Commit

Permalink
driver core: clear deferred probe reason on probe retry
Browse files Browse the repository at this point in the history
commit f0acf63 upstream.

When retrying a deferred probe, any old defer reason string should be
discarded. Otherwise, if the probe is deferred again at a different spot,
but without setting a message, the now incorrect probe reason will remain.

This was observed with the i.MX I2C driver, which ultimately failed
to probe due to lack of the GPIO driver. The probe defer for GPIO
doesn't record a message, but a previous probe defer to clock_get did.
This had the effect that /sys/kernel/debug/devices_deferred listed
a misleading probe deferral reason.

Cc: stable <stable@vger.kernel.org>
Fixes: d090b70 ("driver core: add deferring probe reason to devices_deferred property")
Reviewed-by: Andy Shevchenko <andy.shevchenko@gmail.com>
Reviewed-by: Andrzej Hajda <a.hajda@samsung.com>
Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
Link: https://lore.kernel.org/r/20210319110459.19966-1-a.fatoum@pengutronix.de
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  • Loading branch information
Ahmad Fatoum authored and Greg Kroah-Hartman committed Apr 7, 2021
1 parent b5fab3a commit 9e7a663
Showing 1 changed file with 3 additions and 0 deletions.
3 changes: 3 additions & 0 deletions drivers/base/dd.c
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,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
Expand Down

0 comments on commit 9e7a663

Please sign in to comment.