diff options
| author | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2007-11-13 22:09:15 +0100 |
|---|---|---|
| committer | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2007-11-13 22:09:15 +0100 |
| commit | c1f50cbb06363b36700c0a679a5bd3ddef0a97b6 (patch) | |
| tree | 2af4adaeed66428cd555020ac3337ccbb6f1bddd | |
| parent | 12eda14f8930ccad0d8b75fecab87b90eecba5fb (diff) | |
| download | kernel-crypto-c1f50cbb06363b36700c0a679a5bd3ddef0a97b6.tar.gz kernel-crypto-c1f50cbb06363b36700c0a679a5bd3ddef0a97b6.tar.xz kernel-crypto-c1f50cbb06363b36700c0a679a5bd3ddef0a97b6.zip | |
ide: use drive->select.all for REQ_TYPE_ATA_TASK in execute_drive_cmd()
Use drive->select.all for REQ_TYPE_ATA_TASK requests in execute_drive_cmd()
(the obsolete bits 7 and 5 of the Device register need to be set).
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
| -rw-r--r-- | drivers/ide/ide-io.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/drivers/ide/ide-io.c b/drivers/ide/ide-io.c index 755011827af..db22d1ff4e5 100644 --- a/drivers/ide/ide-io.c +++ b/drivers/ide/ide-io.c @@ -885,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; @@ -903,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) { |