Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=0455fcc821e87d362f2047922c59c0f378a122b5
Commit:     0455fcc821e87d362f2047922c59c0f378a122b5
Parent:     4d977e43d8ae758434e603cf2455d955f71c77c4
Author:     Bartlomiej Zolnierkiewicz <[EMAIL PROTECTED]>
AuthorDate: Sat Jan 26 20:13:12 2008 +0100
Committer:  Bartlomiej Zolnierkiewicz <[EMAIL PROTECTED]>
CommitDate: Sat Jan 26 20:13:12 2008 +0100

    ide: fix final status check in drive_cmd_intr()
    
    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 <[EMAIL PROTECTED]>
    Signed-off-by: Bartlomiej Zolnierkiewicz <[EMAIL PROTECTED]>
---
 drivers/ide/ide-io.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/ide/ide-io.c b/drivers/ide/ide-io.c
index ce8ab10..cad057d 100644
--- a/drivers/ide/ide-io.c
+++ b/drivers/ide/ide-io.c
@@ -659,8 +659,8 @@ static ide_startstop_t drive_cmd_intr (ide_drive_t *drive)
                stat = hwif->INB(IDE_STATUS_REG);
        }
 
-       if (!OK_STAT(stat, READY_STAT, BAD_STAT))
-               return ide_error(drive, "drive_cmd", stat);
+       if (!OK_STAT(stat, (pio_in ? 0 : READY_STAT), BAD_STAT))
+               return ide_error(drive, __FUNCTION__, stat);
                /* calls ide_end_drive_cmd */
        ide_end_drive_cmd(drive, stat, hwif->INB(IDE_ERROR_REG));
        return ide_stopped;
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to