X-Git-Url: http://ftp.safe.ca/?a=blobdiff_plain;f=drivers%2Fide%2Fide-io.c;h=3addbe478d26743701ba669c4ae6acf5b2050725;hb=64a57fe4393bae920d03c253173f59d8a7ec8e25;hp=29cb043a2d3a98b6ec65eb9b3fd7c4e4d4fc0d8c;hpb=c47137a99c597330b69057158b26061a360c0e09;p=safe%2Fjmp%2Flinux-2.6 diff --git a/drivers/ide/ide-io.c b/drivers/ide/ide-io.c index 29cb043..3addbe4 100644 --- a/drivers/ide/ide-io.c +++ b/drivers/ide/ide-io.c @@ -821,8 +821,8 @@ static ide_startstop_t execute_drive_cmd (ide_drive_t *drive, #ifdef DEBUG printk("%s: DRIVE_CMD (null)\n", drive->name); #endif - ide_end_drive_cmd(drive, ide_read_status(drive), - hwif->INB(IDE_ERROR_REG)); + ide_end_drive_cmd(drive, ide_read_status(drive), ide_read_error(drive)); + return ide_stopped; }