summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlan Stern <stern@rowland.harvard.edu>2006-06-23 14:25:34 -0400
committerJames Bottomley <jejb@mulgrave.il.steeleye.com>2006-06-26 10:00:52 -0500
commit9ea7290902abcf22f796e9aeae4dc2e71d3f7e67 (patch)
tree911f84457212f09c160f3e8d9f404c1b6bd60c4e
parent03aba2f79594ca94d159c8bab454de9bcc385b76 (diff)
downloadop-kernel-dev-9ea7290902abcf22f796e9aeae4dc2e71d3f7e67.zip
op-kernel-dev-9ea7290902abcf22f796e9aeae4dc2e71d3f7e67.tar.gz
[SCSI] SCSI core: Allow QUIESCE -> CANCEL sdev transition
We have to be able to remove SCSI devices even when they are suspended, so QUIESCE -> CANCEL must be a legal state transition. This patch (as727) adds the transition to the state machine. Signed-off-by: Alan Stern <stern@rowland.harvard.edu> Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
-rw-r--r--drivers/scsi/scsi_lib.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/scsi/scsi_lib.c b/drivers/scsi/scsi_lib.c
index 4c4add5..68e0d7d 100644
--- a/drivers/scsi/scsi_lib.c
+++ b/drivers/scsi/scsi_lib.c
@@ -2026,6 +2026,7 @@ scsi_device_set_state(struct scsi_device *sdev, enum scsi_device_state state)
switch (oldstate) {
case SDEV_CREATED:
case SDEV_RUNNING:
+ case SDEV_QUIESCE:
case SDEV_OFFLINE:
case SDEV_BLOCK:
break;
OpenPOWER on IntegriCloud