Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-16 17:12:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

ide: fix final status check in drive_cmd_intr()

Browse Source 
Don't check for READY_STAT bit being set for PIO-in protocol (makes the
final status check in drive_cmd_intr() match the one in task_in_intr()).

Also fix function name reported by ide_error() call while at it.

Acked-by: Sergei Shtylyov <sshtylyov@ru.mvista.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
This commit is contained in:
Bartlomiej Zolnierkiewicz 2008-01-26 20:13:12 +01:00
parent 4d977e43d8
commit 0455fcc821
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/ide/ide-io.c
View File

@ -659,8 +659,8 @@ static ide_startstop_t drive_cmd_intr (ide_drive_t *drive)
stat = hwif->INB(IDE_STATUS_REG); stat = hwif->INB(IDE_STATUS_REG);
} }
if (!OK_STAT(stat, READY_STAT, BAD_STAT)) if (!OK_STAT(stat, (pio_in ? 0 : READY_STAT), BAD_STAT))
return ide_error(drive, "drive_cmd", stat); return ide_error(drive, __FUNCTION__, stat);
/* calls ide_end_drive_cmd */ /* calls ide_end_drive_cmd */
ide_end_drive_cmd(drive, stat, hwif->INB(IDE_ERROR_REG)); ide_end_drive_cmd(drive, stat, hwif->INB(IDE_ERROR_REG));
return ide_stopped; return ide_stopped;