From e7ba92f1a996854aa493a4cb978218cf1aaa4676 Mon Sep 17 00:00:00 2001 From: Tejun Heo Date: Sat, 1 Apr 2006 01:38:18 +0900 Subject: [PATCH] --- yaml --- r: 29213 b: refs/heads/master c: 4f65977df0b9a667fdcd85b95d457a220c94113f h: refs/heads/master i: 29211: 7458fda1aa629b1afbfff21f582b6a7bc48410e2 v: v3 --- [refs] | 2 +- trunk/drivers/scsi/libata-core.c | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index ca0a70960148..965083e3d242 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e1211e3fa7fd05ff0d4f597fd37e40de8acc6784 +refs/heads/master: 4f65977df0b9a667fdcd85b95d457a220c94113f diff --git a/trunk/drivers/scsi/libata-core.c b/trunk/drivers/scsi/libata-core.c index c10c550da38b..913e378eca7f 100644 --- a/trunk/drivers/scsi/libata-core.c +++ b/trunk/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);