luck/tmp_suning_uos_patched
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ide-cd: unify request end exit path in cdrom_pc_intr()

Browse Source 
This is a preparation for cdrom_pc_intr() and cdrom_newpc_intr() merge.

Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
This commit is contained in:
Bartlomiej Zolnierkiewicz 2008-02-01 23:09:25 +01:00
parent 8ee69f5a83
commit 8b67ebf6da
1 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
drivers/ide/ide-cd.c
View File

@ -1066,7 +1066,7 @@ static ide_startstop_t cdrom_pc_intr (ide_drive_t *drive)
{ {
struct request *rq = HWGROUP(drive)->rq; struct request *rq = HWGROUP(drive)->rq;
xfer_func_t *xferfunc = NULL; xfer_func_t *xferfunc = NULL;
int stat, ireason, len, thislen, write; int stat, ireason, len, thislen, write, update;
u8 lowcyl = 0, highcyl = 0; u8 lowcyl = 0, highcyl = 0;
/* Check for errors. */ /* Check for errors. */
@ -1084,14 +1084,8 @@ static ide_startstop_t cdrom_pc_intr (ide_drive_t *drive)
Complain if we still have data left to transfer. */ Complain if we still have data left to transfer. */
if ((stat & DRQ_STAT) == 0) { if ((stat & DRQ_STAT) == 0) {
ide_cd_request_sense_fixup(rq); ide_cd_request_sense_fixup(rq);
update = rq->data_len ? 0 : 1;
if (rq->data_len == 0) goto end_request;
cdrom_end_request(drive, 1);
else {
rq->cmd_flags |= REQ_FAILED;
cdrom_end_request(drive, 0);
}
return ide_stopped;
} }
/* Figure out how much data to transfer. */ /* Figure out how much data to transfer. */
@ -1130,9 +1124,8 @@ static ide_startstop_t cdrom_pc_intr (ide_drive_t *drive)
"appears confused (ireason = 0x%02x). " "appears confused (ireason = 0x%02x). "
"Trying to recover by ending request.\n", "Trying to recover by ending request.\n",
drive->name, ireason); drive->name, ireason);
rq->cmd_flags |= REQ_FAILED; update = 0;
cdrom_end_request(drive, 0); goto end_request;
return ide_stopped;
} }
pad: pad:
/* /*
@ -1145,6 +1138,12 @@ static ide_startstop_t cdrom_pc_intr (ide_drive_t *drive)
/* Now we wait for another interrupt. */ /* Now we wait for another interrupt. */
ide_set_handler(drive, &cdrom_pc_intr, ATAPI_WAIT_PC, cdrom_timer_expiry); ide_set_handler(drive, &cdrom_pc_intr, ATAPI_WAIT_PC, cdrom_timer_expiry);
return ide_started; return ide_started;
end_request:
if (!update)
rq->cmd_flags |= REQ_FAILED;
cdrom_end_request(drive, update);
return ide_stopped;
} }
static ide_startstop_t cdrom_do_pc_continuation (ide_drive_t *drive) static ide_startstop_t cdrom_do_pc_continuation (ide_drive_t *drive)