mirror of
https://github.com/torvalds/linux.git
synced 2024-11-12 07:01:57 +00:00
ide-cd: use ide_end_rq() also for failed non-fs requests
Use ide_end_rq() also for failed non-fs requests on completion of REQUEST SENSE requests + use blk_rq_bytes() while at it. Cc: Borislav Petkov <petkovbb@gmail.com> Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
This commit is contained in:
parent
116e690f4e
commit
bf12a9c1c9
@ -265,18 +265,10 @@ static void cdrom_end_request(ide_drive_t *drive, int uptodate)
|
||||
failed->sense_len = rq->sense_len;
|
||||
}
|
||||
cdrom_analyze_sense_data(drive, failed, sense);
|
||||
/*
|
||||
* now end the failed request
|
||||
*/
|
||||
if (blk_fs_request(failed)) {
|
||||
if (ide_end_rq(drive, failed, -EIO,
|
||||
failed->hard_nr_sectors << 9))
|
||||
BUG();
|
||||
} else {
|
||||
if (blk_end_request(failed, -EIO,
|
||||
failed->data_len))
|
||||
BUG();
|
||||
}
|
||||
|
||||
if (ide_end_rq(drive, failed, -EIO,
|
||||
blk_rq_bytes(failed)))
|
||||
BUG();
|
||||
} else
|
||||
cdrom_analyze_sense_data(drive, NULL, sense);
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user