diff --git a/net/smc/smc_ism.c b/net/smc/smc_ism.c
index e36f21ce725208c62164847602e99df91d2c40ba..05ad14630d12752fbf6a201d4cf1e6818cf4c611 100644
--- a/net/smc/smc_ism.c
+++ b/net/smc/smc_ism.c
@@ -274,11 +274,20 @@ EXPORT_SYMBOL_GPL(smcd_alloc_dev);
 
 int smcd_register_dev(struct smcd_dev *smcd)
 {
+	int rc;
+
 	spin_lock(&smcd_dev_list.lock);
 	list_add_tail(&smcd->list, &smcd_dev_list.list);
 	spin_unlock(&smcd_dev_list.lock);
 
-	return device_add(&smcd->dev);
+	rc = device_add(&smcd->dev);
+	if (rc) {
+		spin_lock(&smcd_dev_list.lock);
+		list_del(&smcd->list);
+		spin_unlock(&smcd_dev_list.lock);
+	}
+
+	return rc;
 }
 EXPORT_SYMBOL_GPL(smcd_register_dev);