From 27b3096a0426ccf6c2e8731ed1c45b97e57cbc8f Mon Sep 17 00:00:00 2001
From: Tejun Heo <htejun@gmail.com>
Date: Sat, 11 Mar 2006 11:42:34 +0900
Subject: [PATCH] --- yaml --- r: 21899 b: refs/heads/master c:
 10d996ad1990ec2338c463042db6d5ef4f347187 h: refs/heads/master i:   21897:
 74b6c53099a7057ba7b5876f20727b367ec56766   21895:
 fbfd23dc64d4f62e94a53bb97070ed981f67c57e v: v3

---
 [refs]                          |  2 +-
 trunk/drivers/scsi/sata_sil24.c | 22 ++++++++++++++--------
 2 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/[refs] b/[refs]
index fbd2ff5fd1db..ae1eb4a11d79 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 75deb6fa985bd3162b9472f1fc394e23294da816
+refs/heads/master: 10d996ad1990ec2338c463042db6d5ef4f347187
diff --git a/trunk/drivers/scsi/sata_sil24.c b/trunk/drivers/scsi/sata_sil24.c
index 8fb62427be84..fa1a5ac60639 100644
--- a/trunk/drivers/scsi/sata_sil24.c
+++ b/trunk/drivers/scsi/sata_sil24.c
@@ -440,6 +440,12 @@ static int sil24_softreset(struct ata_port *ap, int verbose,
 
 	DPRINTK("ENTER\n");
 
+	if (!sata_dev_present(ap)) {
+		DPRINTK("PHY reports no device\n");
+		*class = ATA_DEV_NONE;
+		goto out;
+	}
+
 	/* temporarily turn off IRQs during SRST */
 	irq_enable = readl(port + PORT_IRQ_ENABLE_SET);
 	writel(irq_enable, port + PORT_IRQ_ENABLE_CLR);
@@ -469,18 +475,18 @@ static int sil24_softreset(struct ata_port *ap, int verbose,
 	/* restore IRQs */
 	writel(irq_enable, port + PORT_IRQ_ENABLE_SET);
 
-	if (sata_dev_present(ap)) {
-		if (!(irq_stat & PORT_IRQ_COMPLETE)) {
-			DPRINTK("EXIT, srst failed\n");
-			return -EIO;
-		}
-
-		sil24_update_tf(ap);
-		*class = ata_dev_classify(&pp->tf);
+	if (!(irq_stat & PORT_IRQ_COMPLETE)) {
+		DPRINTK("EXIT, srst failed\n");
+		return -EIO;
 	}
+
+	sil24_update_tf(ap);
+	*class = ata_dev_classify(&pp->tf);
+
 	if (*class == ATA_DEV_UNKNOWN)
 		*class = ATA_DEV_NONE;
 
+ out:
 	DPRINTK("EXIT, class=%u\n", *class);
 	return 0;
 }