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

[linux-2.6] / drivers / ide / ide-proc.c

diff --git a/drivers/ide/ide-proc.c b/drivers/ide/ide-proc.c
index a4007d30da520c091491f4ca6e9923b9cc83d232..00c249cba236c88e90d75411e64ce5841f1f2f6e 100644 (file)
--- a/drivers/ide/ide-proc.c
+++ b/drivers/ide/ide-proc.c
@@ -1,6 +1,4 @@
 /*
- *  linux/drivers/ide/ide-proc.c       Version 1.05    Mar 05, 2003
- *
  *  Copyright (C) 1997-1998    Mark Lord
  *  Copyright (C) 2003         Red Hat <alan@redhat.com>
  *
@@ -346,14 +344,20 @@ static int ide_write_setting(ide_drive_t *drive, ide_settings_t *setting, int va
 
 static int set_xfer_rate (ide_drive_t *drive, int arg)
 {
+       ide_task_t task;
        int err;
 
        if (arg < 0 || arg > 70)
                return -EINVAL;
 
-       err = ide_wait_cmd(drive,
-                       WIN_SETFEATURES, (u8) arg,
-                       SETFEATURES_XFER, 0, NULL);
+       memset(&task, 0, sizeof(task));
+       task.tf.command = WIN_SETFEATURES;
+       task.tf.feature = SETFEATURES_XFER;
+       task.tf.nsect   = (u8)arg;
+       task.tf_flags = IDE_TFLAG_OUT_FEATURE | IDE_TFLAG_OUT_NSECT |
+                       IDE_TFLAG_IN_NSECT;
+
+       err = ide_no_data_taskfile(drive, &task);
 
        if (!err && arg) {
                ide_set_xfer_rate(drive, (u8) arg);