aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/scsi/libata-core.c
diff options
context:
space:
mode:
authorTejun Heo <htejun@gmail.com>2006-05-15 20:57:30 +0900
committerTejun Heo <htejun@gmail.com>2006-05-15 20:57:30 +0900
commitf8c2c4202d86e14ca03b7adc7ebcb30fc74b24e1 (patch)
treeacd1428c4cf8f6b2370db54f368309143774e72a /drivers/scsi/libata-core.c
parent6cd727b14f1a6cdcb088d1067c1ba0ba124806a7 (diff)
downloadlinux-f8c2c4202d86e14ca03b7adc7ebcb30fc74b24e1.tar.gz
[PATCH] libata: fix ->phy_reset class code handling in ata_bus_probe()
ata_bus_probe() doesn't clear dev->class after ->phy_reset(). This can result in falsely enabled devices if probing fails. Clear dev->class to ATA_DEV_UNKNOWN after fetching it. Signed-off-by: Tejun Heo <htejun@gmail.com>
Diffstat (limited to 'drivers/scsi/libata-core.c')
-rw-r--r--drivers/scsi/libata-core.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/scsi/libata-core.c b/drivers/scsi/libata-core.c
index 85a004290072e..1669dae53ce33 100644
--- a/drivers/scsi/libata-core.c
+++ b/drivers/scsi/libata-core.c
@@ -1397,9 +1397,11 @@ static int ata_bus_probe(struct ata_port *ap)
} else {
ap->ops->phy_reset(ap);
- if (!(ap->flags & ATA_FLAG_DISABLED))
- for (i = 0; i < ATA_MAX_DEVICES; i++)
+ for (i = 0; i < ATA_MAX_DEVICES; i++) {
+ if (!(ap->flags & ATA_FLAG_DISABLED))
classes[i] = ap->device[i].class;
+ ap->device[i].class = ATA_DEV_UNKNOWN;
+ }
ata_port_probe(ap);
}