diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-01-10 12:04:41 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-01-10 12:04:41 +0100 |
| commit | b17304245f0db0ac69b795c411407808f3f2796d (patch) | |
| tree | 63ed3915d9295bd08f640bf25c322064ba787fad /drivers/ide/cmd640.c | |
| parent | 889c92d21db40be0b7d22a59395060237895bb85 (diff) | |
| parent | 9a100a4464917b5ffff3a8ce1c2758088fd9bb32 (diff) | |
| download | talos-op-linux-b17304245f0db0ac69b795c411407808f3f2796d.tar.gz talos-op-linux-b17304245f0db0ac69b795c411407808f3f2796d.zip | |
Merge branch 'linus' into x86/setup-lzma
Conflicts:
init/do_mounts_rd.c
Diffstat (limited to 'drivers/ide/cmd640.c')
| -rw-r--r-- | drivers/ide/cmd640.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/ide/cmd640.c b/drivers/ide/cmd640.c index e4306647d00d..8890276fef7f 100644 --- a/drivers/ide/cmd640.c +++ b/drivers/ide/cmd640.c @@ -467,11 +467,10 @@ static void program_drive_counts(ide_drive_t *drive, unsigned int index) * so we merge the timings, using the slowest value for each timing. */ if (index > 1) { - ide_hwif_t *hwif = drive->hwif; - ide_drive_t *peer = &hwif->drives[!(drive->dn & 1)]; + ide_drive_t *peer = ide_get_pair_dev(drive); unsigned int mate = index ^ 1; - if (peer->dev_flags & IDE_DFLAG_PRESENT) { + if (peer) { if (setup_count < setup_counts[mate]) setup_count = setup_counts[mate]; if (active_count < active_counts[mate]) |
