Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6

[safe/jmp/linux-2.6] / drivers / ide / cmd640.c

diff --git a/drivers/ide/cmd640.c b/drivers/ide/cmd640.c
index cb11938..d2b8b27 100644 (file)
--- a/drivers/ide/cmd640.c
+++ b/drivers/ide/cmd640.c
@@ -572,9 +572,10 @@ static void cmd640_set_mode(ide_drive_t *drive, unsigned int index,
        program_drive_counts(drive, index);
 }
 
-static void cmd640_set_pio_mode(ide_drive_t *drive, const u8 pio)
+static void cmd640_set_pio_mode(ide_hwif_t *hwif, ide_drive_t *drive)
 {
        unsigned int index = 0, cycle_time;
+       const u8 pio = drive->pio_mode - XFER_PIO_0;
        u8 b;
 
        switch (pio) {