ide: return request status from ->pc_callback method
Make ->pc_callback method return request status and then move the request completion from ->pc_callback to ide_pc_intr(). There should be no functional changes caused by this patch. Acked-by: Borislav Petkov <petkovbb@gmail.com> Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
This commit is contained in:
@@ -357,6 +357,8 @@ static ide_startstop_t ide_pc_intr(ide_drive_t *drive)
|
||||
|
||||
/* No more interrupts */
|
||||
if ((stat & ATA_DRQ) == 0) {
|
||||
int uptodate;
|
||||
|
||||
debug_log("Packet command completed, %d bytes transferred\n",
|
||||
pc->xferred);
|
||||
|
||||
@@ -395,7 +397,15 @@ static ide_startstop_t ide_pc_intr(ide_drive_t *drive)
|
||||
dsc = 1;
|
||||
|
||||
/* Command finished - Call the callback function */
|
||||
drive->pc_callback(drive, dsc);
|
||||
uptodate = drive->pc_callback(drive, dsc);
|
||||
|
||||
if (uptodate == 0)
|
||||
drive->failed_pc = NULL;
|
||||
|
||||
if (blk_special_request(rq))
|
||||
ide_complete_rq(drive, 0);
|
||||
else
|
||||
ide_end_request(drive, uptodate, 0);
|
||||
|
||||
return ide_stopped;
|
||||
}
|
||||
|
Reference in New Issue
Block a user