Commit 7ca32047 authored by Martin Dalecki's avatar Martin Dalecki Committed by Linus Torvalds

[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.
parent e66d5915
...@@ -562,17 +562,17 @@ static ide_proc_entry_t idedisk_proc[] = { ...@@ -562,17 +562,17 @@ static ide_proc_entry_t idedisk_proc[] = {
*/ */
static int set_multcount(ide_drive_t *drive, int arg) static int set_multcount(ide_drive_t *drive, int arg)
{ {
struct ata_taskfile args; struct request rq;
if (drive->special_cmd & ATA_SPECIAL_MMODE) if (drive->special_cmd & ATA_SPECIAL_MMODE)
return -EBUSY; return -EBUSY;
memset(&args, 0, sizeof(args)); ide_init_drive_cmd(&rq);
drive->mult_req = arg; drive->mult_req = arg;
drive->special_cmd |= ATA_SPECIAL_MMODE; 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; return (drive->mult_count == arg) ? 0 : -EIO;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment