blob: 361e134d3364319a55ccb8de641458fdad5ea1bb [file] [log] [blame]
From 9ab65d340b9783d7ab59d300fa26e5b48f36fe26 Mon Sep 17 00:00:00 2001
From: Geert Uytterhoeven <>
Date: Fri, 6 Dec 2019 14:22:19 +0100
Subject: [PATCH] driver core: Print device when resources present in
commit 7c35e699c88bd60734277b26962783c60e04b494 upstream.
If a device already has devres items attached before probing, a warning
backtrace is printed. However, this backtrace does not reveal the
offending device, leaving the user uninformed. Furthermore, using
WARN_ON() causes systems with panic-on-warn to reboot.
Fix this by replacing the WARN_ON() by a dev_crit() message.
Abort probing the device, to prevent doing more damage to the device's
Signed-off-by: Geert Uytterhoeven <>
Signed-off-by: Greg Kroah-Hartman <>
Signed-off-by: Paul Gortmaker <>
diff --git a/drivers/base/dd.c b/drivers/base/dd.c
index 0df9b4461766..f83b0c9cd0b1 100644
--- a/drivers/base/dd.c
+++ b/drivers/base/dd.c
@@ -477,7 +477,10 @@ static int really_probe(struct device *dev, struct device_driver *drv)
pr_debug("bus: '%s': %s: probing driver %s with device %s\n",
drv->bus->name, __func__, drv->name, dev_name(dev));
- WARN_ON(!list_empty(&dev->devres_head));
+ if (!list_empty(&dev->devres_head)) {
+ dev_crit(dev, "Resources present before probing\n");
+ return -EBUSY;
+ }
dev->driver = drv;