diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-03-04 11:24:06 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-03-04 11:24:06 -0500 |
commit | 4c10c937cc2eb197db565392db91d429eec71176 (patch) | |
tree | 02d7f15b314441e832f48f0f882882042361396c /drivers/ide/ide-probe.c | |
parent | 9bb676966aa85e56af00b353387d3c274a26e480 (diff) | |
parent | 950f564b707ca1b1c5bb94cd1e7d2a0702bfcadc (diff) |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide-next-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide-next-2.6: (49 commits)
drivers/ide: Fix continuation line formats
ide: fixed section mismatch warning in cmd640.c
ide: ide_timing_compute() fixup
ide: make ide_get_best_pio_mode() static
via82cxxx: use ->pio_mode value to determine pair device speed
tx493xide: use ->pio_mode value to determine pair device speed
siimage: use ->pio_mode value to determine pair device speed
palm_bk3710: use ->pio_mode value to determine pair device speed
it821x: use ->pio_mode value to determine pair device speed
cs5536: use ->pio_mode value to determine pair device speed
cs5535: use ->pio_mode value to determine pair device speed
cmd64x: fix handling of address setup timings
amd74xx: use ->pio_mode value to determine pair device speed
alim15x3: fix handling of UDMA enable bit
alim15x3: fix handling of DMA timings
alim15x3: fix handling of command timings
alim15x3: fix handling of address setup timings
ide-timings: use ->pio_mode value to determine fastest PIO speed
ide: change ->set_dma_mode method parameters
ide: change ->set_pio_mode method parameters
...
Diffstat (limited to 'drivers/ide/ide-probe.c')
-rw-r--r-- | drivers/ide/ide-probe.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/ide/ide-probe.c b/drivers/ide/ide-probe.c index f8c1ae6ad74c..fbedd35feb44 100644 --- a/drivers/ide/ide-probe.c +++ b/drivers/ide/ide-probe.c | |||
@@ -1042,6 +1042,8 @@ static void ide_port_init_devices(ide_hwif_t *hwif) | |||
1042 | if (hwif->host_flags & IDE_HFLAG_NO_UNMASK_IRQS) | 1042 | if (hwif->host_flags & IDE_HFLAG_NO_UNMASK_IRQS) |
1043 | drive->dev_flags |= IDE_DFLAG_NO_UNMASK; | 1043 | drive->dev_flags |= IDE_DFLAG_NO_UNMASK; |
1044 | 1044 | ||
1045 | drive->pio_mode = XFER_PIO_0; | ||
1046 | |||
1045 | if (port_ops && port_ops->init_dev) | 1047 | if (port_ops && port_ops->init_dev) |
1046 | port_ops->init_dev(drive); | 1048 | port_ops->init_dev(drive); |
1047 | } | 1049 | } |