2 files changed, 3 insertions, 2 deletions

diff --git a/drivers/base/transport_class.c b/drivers/base/transport_class.c
index 40bca48abc12..cabd0edf2156 100644
--- a/drivers/base/transport_class.c
+++ b/drivers/base/transport_class.c
@@ -108,7 +108,8 @@ EXPORT_SYMBOL_GPL(anon_transport_class_register);
  */
 void anon_transport_class_unregister(struct anon_transport_class *atc)
 {
-        attribute_container_unregister(&atc->container);
+        if (unlikely(attribute_container_unregister(&atc->container)))
+                BUG();
 }
 EXPORT_SYMBOL_GPL(anon_transport_class_unregister);
 
diff --git a/drivers/scsi/raid_class.c b/drivers/scsi/raid_class.c
index 86e13183c9ba..52182a744ba6 100644
--- a/drivers/scsi/raid_class.c
+++ b/drivers/scsi/raid_class.c
@@ -289,7 +289,7 @@ raid_class_release(struct raid_template *r)
 {
         struct raid_internal *i = to_raid_internal(r);
 
-        attribute_container_unregister(&i->r.raid_attrs.ac);
+        BUG_ON(attribute_container_unregister(&i->r.raid_attrs.ac));
 
         kfree(i);
 }