diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-04-01 14:29:12 -0500 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-04-01 14:29:12 -0500 |
| commit | 6e07e16404deafadf45895a7d2aeb5feba53b479 (patch) | |
| tree | a7025d6632f0b3eb6232eafba79f331ead812fcf /drivers/scsi/sata_mv.c | |
| parent | 08a556db919f67e1e4d33ae8d40f7222da34d994 (diff) | |
| parent | e8e0619f68bff8f39d98c46aac85ed1d4557ccfd (diff) | |
Merge branch 'upstream'
Diffstat (limited to 'drivers/scsi/sata_mv.c')
| -rw-r--r-- | drivers/scsi/sata_mv.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/sata_mv.c b/drivers/scsi/sata_mv.c index 4d965601efcf..dc54f294fac8 100644 --- a/drivers/scsi/sata_mv.c +++ b/drivers/scsi/sata_mv.c | |||
| @@ -1991,7 +1991,7 @@ comreset_retry: | |||
| 1991 | tf.nsect = readb((void __iomem *) ap->ioaddr.nsect_addr); | 1991 | tf.nsect = readb((void __iomem *) ap->ioaddr.nsect_addr); |
| 1992 | 1992 | ||
| 1993 | dev->class = ata_dev_classify(&tf); | 1993 | dev->class = ata_dev_classify(&tf); |
| 1994 | if (!ata_dev_present(dev)) { | 1994 | if (!ata_dev_enabled(dev)) { |
| 1995 | VPRINTK("Port disabled post-sig: No device present.\n"); | 1995 | VPRINTK("Port disabled post-sig: No device present.\n"); |
| 1996 | ata_port_disable(ap); | 1996 | ata_port_disable(ap); |
| 1997 | } | 1997 | } |