[PATCH] 2.5.10 IDE 45

- Fix bogus set_multimode() change. I tough I had reverted it before diff-ing.
   This was causing hangs of /dev/hdparm -m8 /dev/hda and similar commands.

diff --git a/drivers/ide/ide-disk.c b/drivers/ide/ide-disk.c
index 597cebd56c32ba9811a5c3d3107c7cbad3e824c3..f19eb2bbaa1e5d4cc8432e5a25195f959b54a57e 100644 (file)
--- a/drivers/ide/ide-disk.c
+++ b/drivers/ide/ide-disk.c
@@ -562,17 +562,17 @@ static ide_proc_entry_t idedisk_proc[] = {
  */
 static int set_multcount(ide_drive_t *drive, int arg)
 {
-       struct ata_taskfile args;
+       struct request rq;
 
        if (drive->special_cmd & ATA_SPECIAL_MMODE)
                return -EBUSY;
 
-       memset(&args, 0, sizeof(args));
+       ide_init_drive_cmd(&rq);
 
        drive->mult_req = arg;
        drive->special_cmd |= ATA_SPECIAL_MMODE;
 
-       ide_raw_taskfile(drive, &args, NULL);
+       ide_do_drive_cmd (drive, &rq, ide_wait);
 
        return (drive->mult_count == arg) ? 0 : -EIO;
 }