diff --git a/drivers/scsi/scsi_dh.c b/drivers/scsi/scsi_dh.c
index 2e1db5738ae1a6da8532ddbf80e033fa6b8001fd..9f6511da5023903b0b55cf6066b346b605e55930 100644
--- a/drivers/scsi/scsi_dh.c
+++ b/drivers/scsi/scsi_dh.c
@@ -181,8 +181,10 @@ store_dh_state(struct device *dev, struct device_attribute *attr,
 			/*
 			 * Detach from a device handler
 			 */
-			scsi_dh_handler_detach(sdev);
-			err = 0;
+			sdev_printk(KERN_WARNING, sdev,
+				    "can't detach handler %s.\n",
+				    sdev->handler->name);
+			err = -EINVAL;
 		} else if (!strncmp(buf, "activate", 8)) {
 			/*
 			 * Activate a device handler