diff --git a/drivers/base/dd.c b/drivers/base/dd.c
index 3e62b2f24bfb899ecc7e04224d385dd05d6d7ec4..bde049c998de6fcc5101df5471e030d9a3124089 100644
--- a/drivers/base/dd.c
+++ b/drivers/base/dd.c
@@ -1062,6 +1062,7 @@ static int __driver_attach(struct device *dev, void *data)
 {
 	struct device_driver *drv = data;
 	int ret;
+	bool async = false;
 
 	/*
 	 * Lock device and try to bind to it. We drop the error
@@ -1098,9 +1099,11 @@ static int __driver_attach(struct device *dev, void *data)
 		if (!dev->driver) {
 			get_device(dev);
 			dev->p->async_driver = drv;
-			async_schedule_dev(__driver_attach_async_helper, dev);
+			async = true;
 		}
 		device_unlock(dev);
+		if (async)
+			async_schedule_dev(__driver_attach_async_helper, dev);
 		return 0;
 	}