1 files changed, 5 insertions, 1 deletions

diff --git a/drivers/base/driver.c b/drivers/base/driver.c
index ba912558a510..857c8f1b876e 100644
--- a/drivers/base/driver.c
+++ b/drivers/base/driver.c
@@ -148,7 +148,11 @@ int driver_register(struct device_driver *drv)
         int ret;
         struct device_driver *other;
 
-        BUG_ON(!drv->bus->p);
+        if (!drv->bus->p) {
+                pr_err("Driver '%s' was unable to register with bus_type '%s' because the bus was not initialized.\n",
+                           drv->name, drv->bus->name);
+                return -EINVAL;
+        }
 
         if ((drv->bus->probe && drv->probe) ||
             (drv->bus->remove && drv->remove) ||