From: Tejun Heo <htejun@gmail.com>
Date: Tue, 11 Apr 2006 13:26:29 +0000 (+0900)
Subject: [PATCH] libata: cosmetic update to ata_bus_probe()
X-Git-Tag: v2.6.18-rc1~1079^2~117
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=51713d359ae274fa4dd4b199ba3a6b0c21ef99e0;p=karo-tx-linux.git

[PATCH] libata: cosmetic update to ata_bus_probe()

Move ata_set_mode() failure handling outside of ap->ops->set_mode if
clause such that it can handle ap->ops->set_mode failures after it's
updated.

Signed-off-by: Tejun Heo <htejun@gmail.com>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
---

diff --git a/drivers/scsi/libata-core.c b/drivers/scsi/libata-core.c
index 9194e4a6a55a..588578dc6caf 100644
--- a/drivers/scsi/libata-core.c
+++ b/drivers/scsi/libata-core.c
@@ -1441,12 +1441,12 @@ static int ata_bus_probe(struct ata_port *ap)
 				break;
 			}
 		rc = 0;
-	} else {
+	} else
 		rc = ata_set_mode(ap, &dev);
-		if (rc) {
-			down_xfermask = 1;
-			goto fail;
-		}
+
+	if (rc) {
+		down_xfermask = 1;
+		goto fail;
 	}
 
 	for (i = 0; i < ATA_MAX_DEVICES; i++)