1 files changed, 5 insertions, 6 deletions

diff --git a/drivers/ide/ide-io.c b/drivers/ide/ide-io.c
index c89f0d3058e9..db22d1ff4e55 100644
--- a/drivers/ide/ide-io.c
+++ b/drivers/ide/ide-io.c
@@ -340,6 +340,8 @@ void ide_end_drive_cmd (ide_drive_t *drive, u8 stat, u8 err)
                 if (args) {
                         args[0] = stat;
                         args[1] = err;
+                        /* be sure we're looking at the low order bits */
+                        hwif->OUTB(drive->ctl & ~0x80, IDE_CONTROL_REG);
                         args[2] = hwif->INB(IDE_NSECTOR_REG);
                         args[3] = hwif->INB(IDE_SECTOR_REG);
                         args[4] = hwif->INB(IDE_LCYL_REG);
@@ -654,7 +656,8 @@ static ide_startstop_t drive_cmd_intr (ide_drive_t *drive)
         int retries = 10;
 
         local_irq_enable_in_hardirq();
-        if ((stat & DRQ_STAT) && args && args[3]) {
+        if (rq->cmd_type == REQ_TYPE_ATA_CMD &&
+            (stat & DRQ_STAT) && args && args[3]) {
                 u8 io_32bit = drive->io_32bit;
                 drive->io_32bit = 0;
                 hwif->ata_input_data(drive, &args[4], args[3] * SECTOR_WORDS);
@@ -882,7 +885,6 @@ static ide_startstop_t execute_drive_cmd (ide_drive_t *drive,
                 return do_rw_taskfile(drive, args);
         } else if (rq->cmd_type == REQ_TYPE_ATA_TASK) {
                 u8 *args = rq->buffer;
-                u8 sel;
  
                 if (!args)
                         goto done;
@@ -900,10 +902,7 @@ static ide_startstop_t execute_drive_cmd (ide_drive_t *drive,
                 hwif->OUTB(args[3], IDE_SECTOR_REG);
                 hwif->OUTB(args[4], IDE_LCYL_REG);
                 hwif->OUTB(args[5], IDE_HCYL_REG);
-                sel = (args[6] & ~0x10);
-                if (drive->select.b.unit)
-                        sel |= 0x10;
-                hwif->OUTB(sel, IDE_SELECT_REG);
+                hwif->OUTB((args[6] & 0xEF)|drive->select.all, IDE_SELECT_REG);
                 ide_cmd(drive, args[0], args[2], &drive_cmd_intr);
                 return ide_started;
         } else if (rq->cmd_type == REQ_TYPE_ATA_CMD) {