---

yaml --- r: 30904 b: refs/heads/master c: beb07c1 h: refs/heads/master v: v3
git-mirror · Jun 27, 2006 · 98467c1 · 98467c1
1 parent 5d2a4bb
commit 98467c1
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: 64f65ca6e7a5a42df22ff29dadfff389dc388f65
+refs/heads/master: beb07c1a56e2cff3842e22c473bd1aaaea08e532
diff --git a/trunk/drivers/scsi/libata-eh.c b/trunk/drivers/scsi/libata-eh.c
@@ -734,6 +734,10 @@ static void ata_eh_detach_dev(struct ata_device *dev)
 		ap->flags |= ATA_FLAG_SCSI_HOTPLUG;
 	}
 
+	/* clear per-dev EH actions */
+	ata_eh_clear_action(dev, &ap->eh_info, ATA_EH_PERDEV_MASK);
+	ata_eh_clear_action(dev, &ap->eh_context.i, ATA_EH_PERDEV_MASK);
+
 	spin_unlock_irqrestore(ap->lock, flags);
 }