diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2007-10-19 00:30:05 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2007-11-16 09:30:24 -0800 |
| commit | afcfc80560c78a7d1f865a67f5c2f41091f6a48e (patch) | |
| tree | 16fd459da07288e107f87e98f13dc8bf6aa54c72 /drivers/ide | |
| parent | 61c5c64a1d07ffec6e1b511a680bd3c53b1d490a (diff) | |
ide: Fix siimage driver accessing beyond array boundary
patch a87a87ccdc541e0a0cc8c7d01a365be8d9153a7b in mainline.
The siimage uses an incorrect construct to access the other drive of a pair,
causing it to access beyond an array boundary on the secondary interface.
This fixes it by using the new ide_get_paired_drive() helper instead.
Bart: patch description fixes
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Andrew Morton <akpm@osdl.org>
Acked-by: Sergei Shtylyov <sshtylyov@ru.mvista.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/ide')
| -rw-r--r-- | drivers/ide/pci/siimage.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/ide/pci/siimage.c b/drivers/ide/pci/siimage.c index 50f6d172ef7..713064d3535 100644 --- a/drivers/ide/pci/siimage.c +++ b/drivers/ide/pci/siimage.c @@ -180,7 +180,7 @@ static void sil_tune_pio(ide_drive_t *drive, u8 pio) const u16 data_speed[] = { 0x328a, 0x2283, 0x1104, 0x10c3, 0x10c1 }; ide_hwif_t *hwif = HWIF(drive); - ide_drive_t *pair = &hwif->drives[drive->dn ^ 1]; + ide_drive_t *pair = ide_get_paired_drive(drive); u32 speedt = 0; u16 speedp = 0; unsigned long addr = siimage_seldev(drive, 0x04); |