2 files changed, 5 insertions, 19 deletions

diff --git a/drivers/ide/ide-iops.c b/drivers/ide/ide-iops.c
index 09069da22749..99fe50e941be 100644
--- a/drivers/ide/ide-iops.c
+++ b/drivers/ide/ide-iops.c
@@ -627,24 +627,6 @@ int ide_ata66_check (ide_drive_t *drive, ide_task_t *args)
         return 0;
 }
 
-/*
- * Backside of HDIO_DRIVE_CMD call of SETFEATURES_XFER.
- * 1 : Safe to update drive->id DMA registers.
- * 0 : OOPs not allowed.
- */
-int set_transfer (ide_drive_t *drive, ide_task_t *args)
-{
-        if (args->tf.command == WIN_SETFEATURES &&
-            args->tf.nsect >= XFER_SW_DMA_0 &&
-            args->tf.feature == SETFEATURES_XFER &&
-            (drive->id->dma_ultra ||
-             drive->id->dma_mword ||
-             drive->id->dma_1word))
-                return 1;
-
-        return 0;
-}
-
 #ifdef CONFIG_BLK_DEV_IDEDMA
 static u8 ide_auto_reduce_xfer (ide_drive_t *drive)
 {
diff --git a/drivers/ide/ide-taskfile.c b/drivers/ide/ide-taskfile.c
index 16a9a581d089..bf72b6d9f685 100644
--- a/drivers/ide/ide-taskfile.c
+++ b/drivers/ide/ide-taskfile.c
@@ -755,6 +755,7 @@ int ide_cmd_ioctl (ide_drive_t *drive, unsigned int cmd, unsigned long arg)
         u8 args[4], xfer_rate = 0;
         ide_task_t tfargs;
         struct ide_taskfile *tf = &tfargs.tf;
+        struct hd_driveid *id = drive->id;
 
         if (NULL == (void *) arg) {
                 struct request rq;
@@ -792,7 +793,10 @@ int ide_cmd_ioctl (ide_drive_t *drive, unsigned int cmd, unsigned long arg)
                         return -ENOMEM;
         }
 
-        if (set_transfer(drive, &tfargs)) {
+        if (tf->command == WIN_SETFEATURES &&
+            tf->feature == SETFEATURES_XFER &&
+            tf->nsect >= XFER_SW_DMA_0 &&
+            (id->dma_ultra || id->dma_mword || id->dma_1word)) {
                 xfer_rate = args[1];
                 if (ide_ata66_check(drive, &tfargs))
                         goto abort;