2 files changed, 7 insertions, 11 deletions

diff --git a/drivers/ide/ide-taskfile.c b/drivers/ide/ide-taskfile.c
index b3c32c5fef35..62ebefd6394a 100644
--- a/drivers/ide/ide-taskfile.c
+++ b/drivers/ide/ide-taskfile.c
@@ -773,19 +773,13 @@ ide_startstop_t flagged_taskfile (ide_drive_t *drive, ide_task_t *task)
         }
 
         /*
-         * (ks) Check taskfile in/out flags.
+         * (ks) Check taskfile in flags.
          * If set, then execute as it is defined.
          * If not set, then define default settings.
          * The default values are:
-         *      write and read all taskfile registers (except data) 
-         *      write and read the hob registers (sector,nsector,lcyl,hcyl)
+         *      read all taskfile registers (except data)
+         *      read the hob registers (sector, nsector, lcyl, hcyl)
          */
-        if (task->tf_out_flags.all == 0) {
-                task->tf_out_flags.all = IDE_TASKFILE_STD_OUT_FLAGS;
-                if (drive->addressing == 1)
-                        task->tf_out_flags.all |= (IDE_HOB_STD_OUT_FLAGS << 8);
-        }
-
         if (task->tf_in_flags.all == 0) {
                 task->tf_in_flags.all = IDE_TASKFILE_STD_IN_FLAGS;
                 if (drive->addressing == 1)
diff --git a/include/linux/hdreg.h b/include/linux/hdreg.h
index b5d660089de4..2b54eac738ea 100644
--- a/include/linux/hdreg.h
+++ b/include/linux/hdreg.h
@@ -80,10 +80,12 @@
 /*
  * Define standard taskfile in/out register
  */
-#define IDE_TASKFILE_STD_OUT_FLAGS      0xFE
 #define IDE_TASKFILE_STD_IN_FLAGS       0xFE
-#define IDE_HOB_STD_OUT_FLAGS           0x3C
 #define IDE_HOB_STD_IN_FLAGS            0x3C
+#ifndef __KERNEL__
+#define IDE_TASKFILE_STD_OUT_FLAGS      0xFE
+#define IDE_HOB_STD_OUT_FLAGS           0x3C
+#endif
 
 typedef unsigned char task_ioreg_t;
 typedef unsigned long sata_ioreg_t;