mirrors/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2025-11-04 02:30:34 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

ide: use drive->select.all for REQ_TYPE_ATA_TASK in execute_drive_cmd()

Browse source 
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>
This commit is contained in:
Bartlomiej Zolnierkiewicz 2007-11-13 22:09:15 +01:00
parent 12eda14f89
commit c1f50cbb06
1 changed files with 1 additions and 5 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

6
drivers/ide/ide-io.c
View file

@ -885,7 +885,6 @@ static ide_startstop_t execute_drive_cmd (ide_drive_t *drive,
return do_rw_taskfile(drive, args); return do_rw_taskfile(drive, args);
} else if (rq->cmd_type == REQ_TYPE_ATA_TASK) { } else if (rq->cmd_type == REQ_TYPE_ATA_TASK) {
u8 *args = rq->buffer; u8 *args = rq->buffer;
u8 sel;
if (!args) if (!args)
goto done; 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[3], IDE_SECTOR_REG);
hwif->OUTB(args[4], IDE_LCYL_REG); hwif->OUTB(args[4], IDE_LCYL_REG);
hwif->OUTB(args[5], IDE_HCYL_REG); hwif->OUTB(args[5], IDE_HCYL_REG);
sel = (args[6] & ~0x10); hwif->OUTB((args[6] & 0xEF)|drive->select.all, IDE_SELECT_REG);
if (drive->select.b.unit)
sel |= 0x10;
hwif->OUTB(sel, IDE_SELECT_REG);
ide_cmd(drive, args[0], args[2], &drive_cmd_intr); ide_cmd(drive, args[0], args[2], &drive_cmd_intr);
return ide_started; return ide_started;
} else if (rq->cmd_type == REQ_TYPE_ATA_CMD) { } else if (rq->cmd_type == REQ_TYPE_ATA_CMD) {