aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/scsi/libata-core.c
diff options
context:
space:
mode:
authorTejun Heo <htejun@gmail.com>2006-04-11 09:26:29 -0400
committerJeff Garzik <jeff@garzik.org>2006-04-11 13:22:17 -0400
commit51713d359ae274fa4dd4b199ba3a6b0c21ef99e0 (patch)
treec233c1f8848ed921cabd4f8591085c24ccb0cdc3 /drivers/scsi/libata-core.c
parentec573755fcd7975aae6b0d536dbcd74a6eed029c (diff)
[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>
Diffstat (limited to 'drivers/scsi/libata-core.c')
-rw-r--r--drivers/scsi/libata-core.c10
1 files changed, 5 insertions, 5 deletions
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)
1441 break; 1441 break;
1442 } 1442 }
1443 rc = 0; 1443 rc = 0;
1444 } else { 1444 } else
1445 rc = ata_set_mode(ap, &dev); 1445 rc = ata_set_mode(ap, &dev);
1446 if (rc) { 1446
1447 down_xfermask = 1; 1447 if (rc) {
1448 goto fail; 1448 down_xfermask = 1;
1449 } 1449 goto fail;
1450 } 1450 }
1451 1451
1452 for (i = 0; i < ATA_MAX_DEVICES; i++) 1452 for (i = 0; i < ATA_MAX_DEVICES; i++)