diff options
| author | Tejun Heo | 2006-03-31 18:38:18 +0200 |
|---|---|---|
| committer | Jeff Garzik | 2006-04-01 19:33:46 +0200 |
| commit | 4f65977df0b9a667fdcd85b95d457a220c94113f (patch) | |
| tree | b7cccdf707088b2f5c07c01c26b7761ef92ed175 /drivers/scsi/libata-core.c | |
| parent | [PATCH] libata: implement ata_dev_enabled and disabled() (diff) | |
| download | kernel-qcow2-linux-4f65977df0b9a667fdcd85b95d457a220c94113f.tar.gz kernel-qcow2-linux-4f65977df0b9a667fdcd85b95d457a220c94113f.tar.xz kernel-qcow2-linux-4f65977df0b9a667fdcd85b95d457a220c94113f.zip | |
[PATCH] libata: make ata_set_mode() handle no-device case properly
Make ata_set_mode() return without doing anything if there is no
device on the port. This is in preparation for ata_bus_probe()
changes.
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.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/scsi/libata-core.c b/drivers/scsi/libata-core.c index c10c550da38b..913e378eca7f 100644 --- a/drivers/scsi/libata-core.c +++ b/drivers/scsi/libata-core.c @@ -1823,7 +1823,7 @@ static void ata_host_set_dma(struct ata_port *ap) */ static void ata_set_mode(struct ata_port *ap) { - int i, rc, used_dma = 0; + int i, rc, used_dma = 0, found = 0; /* step 1: calculate xfer_mask */ for (i = 0; i < ATA_MAX_DEVICES; i++) { @@ -1842,9 +1842,12 @@ static void ata_set_mode(struct ata_port *ap) dev->pio_mode = ata_xfer_mask2mode(pio_mask); dev->dma_mode = ata_xfer_mask2mode(dma_mask); + found = 1; if (dev->dma_mode) used_dma = 1; } + if (!found) + return; /* step 2: always set host PIO timings */ rc = ata_host_set_pio(ap); |