lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[PATCH] libata: make ata_set_mode() handle no-device case properly

Browse Source 
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>
This commit is contained in:
Tejun Heo
2006-04-01 01:38:18 +09:00
committed by Jeff Garzik
parent e1211e3fa7
commit 4f65977df0
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/scsi/libata-core.c
View File

@@ -1823,7 +1823,7 @@ static void ata_host_set_dma(struct ata_port *ap)
*/ */
static void ata_set_mode(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 */ /* step 1: calculate xfer_mask */
for (i = 0; i < ATA_MAX_DEVICES; i++) { 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->pio_mode = ata_xfer_mask2mode(pio_mask);
dev->dma_mode = ata_xfer_mask2mode(dma_mask); dev->dma_mode = ata_xfer_mask2mode(dma_mask);
found = 1;
if (dev->dma_mode) if (dev->dma_mode)
used_dma = 1; used_dma = 1;
} }
if (!found)
return;
/* step 2: always set host PIO timings */ /* step 2: always set host PIO timings */
rc = ata_host_set_pio(ap); rc = ata_host_set_pio(ap);