diff --git a/drivers/base/attribute_container.c b/drivers/base/attribute_container.c
index 62c093db11e6e853c7b8d5c22ca1603f904aea07..ebcae5c34133d42796b01aab26f130bd53557472 100644
--- a/drivers/base/attribute_container.c
+++ b/drivers/base/attribute_container.c
@@ -237,6 +237,11 @@ attribute_container_device_trigger(struct device *dev,
 		if (!cont->match(cont, dev))
 			continue;
 
+		if (attribute_container_no_classdevs(cont)) {
+			fn(cont, dev, NULL);
+			continue;
+		}
+
 		spin_lock(&cont->containers_lock);
 		list_for_each_entry_safe(ic, tmp, &cont->containers, node) {
 			if (dev == ic->classdev.dev)
diff --git a/drivers/base/transport_class.c b/drivers/base/transport_class.c
index 4fb4c5de8470cc9b4c17d87ffb896014b37e0de4..f25e7c6b2d27301990eb6bc133015b5889a754e9 100644
--- a/drivers/base/transport_class.c
+++ b/drivers/base/transport_class.c
@@ -7,7 +7,7 @@
  * This file is licensed under GPLv2
  *
  * The basic idea here is to allow any "device controller" (which
- * would most often be a Host Bus Adapter" to use the services of one
+ * would most often be a Host Bus Adapter to use the services of one
  * or more tranport classes for performing transport specific
  * services.  Transport specific services are things that the generic
  * command layer doesn't want to know about (speed settings, line