---

yaml --- r: 271035 b: refs/heads/master c: 6bc8d2a h: refs/heads/master i: 271033: a188bab 271031: 4f686b4 v: v3
git-mirror · Aug 30, 2011 · 1ce1350 · 1ce1350
1 parent dadb56d
commit 1ce1350
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 46ccf6b55bfa9fff7d0a9da761f186e98cf2f660
+refs/heads/master: 6bc8d2a0c6bb3e52f0c66e6cde6799d1b90b42ba
diff --git a/trunk/drivers/scsi/device_handler/scsi_dh.c b/trunk/drivers/scsi/device_handler/scsi_dh.c
@@ -190,6 +190,10 @@ store_dh_state(struct device *dev, struct device_attribute *attr,
 	struct scsi_device_handler *scsi_dh;
 	int err = -EINVAL;
 
+	if (sdev->sdev_state == SDEV_CANCEL ||
+	    sdev->sdev_state == SDEV_DEL)
+		return -ENODEV;
+
 	if (!sdev->scsi_dh_data) {
 		/*
 		 * Attach to a device handler