diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-04-04 08:45:13 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-04-04 08:45:13 -0400 |
| commit | 79fa1b677be3a985cc66b9218a4dd09818f1051b (patch) | |
| tree | d36030be7cd07461055f005394ef275212353010 /drivers/scsi/ahci.c | |
| parent | 31ce6daefe2d312e31ee06b0b3301b1cb7878c04 (diff) | |
| parent | c2a6585296009379e0f4eff39cdcb108b457ebf2 (diff) | |
| download | linux-79fa1b677be3a985cc66b9218a4dd09818f1051b.tar.bz2 | |
Merge branch 'upstream'
Diffstat (limited to 'drivers/scsi/ahci.c')
| -rw-r--r-- | drivers/scsi/ahci.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/scsi/ahci.c b/drivers/scsi/ahci.c index 0c5f0c844d21..ff48066d4c4f 100644 --- a/drivers/scsi/ahci.c +++ b/drivers/scsi/ahci.c @@ -549,6 +549,12 @@ static int ahci_softreset(struct ata_port *ap, int verbose, unsigned int *class) DPRINTK("ENTER\n"); + if (!sata_dev_present(ap)) { + DPRINTK("PHY reports no device\n"); + *class = ATA_DEV_NONE; + return 0; + } + /* prepare for SRST (AHCI-1.1 10.4.1) */ rc = ahci_stop_engine(ap); if (rc) { |