diff options
| author | Takashi Iwai <tiwai@suse.de> | 2010-09-03 22:38:52 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2010-09-03 22:38:52 +0200 |
| commit | 68885a3ff38ed51fa02f241feb405c9922a90ee0 (patch) | |
| tree | 2fc626df39d5e0e1f6b065238141f7d49187c737 /drivers/ata/pata_cmd64x.c | |
| parent | ALSA: usb-audio: add BOSS ME-25 support (diff) | |
| parent | ALSA: usb-audio: fix detection of vendor-specific device protocol settings (diff) | |
| download | linux-68885a3ff38ed51fa02f241feb405c9922a90ee0.tar.xz linux-68885a3ff38ed51fa02f241feb405c9922a90ee0.zip | |
Merge branch 'fix/misc' into topic/misc
Diffstat (limited to 'drivers/ata/pata_cmd64x.c')
| -rw-r--r-- | drivers/ata/pata_cmd64x.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/drivers/ata/pata_cmd64x.c b/drivers/ata/pata_cmd64x.c index 9f5da1c7454b..905ff76d3cbb 100644 --- a/drivers/ata/pata_cmd64x.c +++ b/drivers/ata/pata_cmd64x.c @@ -121,14 +121,8 @@ static void cmd64x_set_timing(struct ata_port *ap, struct ata_device *adev, u8 m if (pair) { struct ata_timing tp; - ata_timing_compute(pair, pair->pio_mode, &tp, T, 0); ata_timing_merge(&t, &tp, &t, ATA_TIMING_SETUP); - if (pair->dma_mode) { - ata_timing_compute(pair, pair->dma_mode, - &tp, T, 0); - ata_timing_merge(&tp, &t, &t, ATA_TIMING_SETUP); - } } } |