diff options
Diffstat (limited to 'drivers/ide')
-rw-r--r-- | drivers/ide/ide-cd.c | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/drivers/ide/ide-cd.c b/drivers/ide/ide-cd.c index a71ca2a9ab4b..6f64fb2f63d0 100644 --- a/drivers/ide/ide-cd.c +++ b/drivers/ide/ide-cd.c | |||
@@ -265,18 +265,10 @@ static void cdrom_end_request(ide_drive_t *drive, int uptodate) | |||
265 | failed->sense_len = rq->sense_len; | 265 | failed->sense_len = rq->sense_len; |
266 | } | 266 | } |
267 | cdrom_analyze_sense_data(drive, failed, sense); | 267 | cdrom_analyze_sense_data(drive, failed, sense); |
268 | /* | 268 | |
269 | * now end the failed request | 269 | if (ide_end_rq(drive, failed, -EIO, |
270 | */ | 270 | blk_rq_bytes(failed))) |
271 | if (blk_fs_request(failed)) { | 271 | BUG(); |
272 | if (ide_end_rq(drive, failed, -EIO, | ||
273 | failed->hard_nr_sectors << 9)) | ||
274 | BUG(); | ||
275 | } else { | ||
276 | if (blk_end_request(failed, -EIO, | ||
277 | failed->data_len)) | ||
278 | BUG(); | ||
279 | } | ||
280 | } else | 272 | } else |
281 | cdrom_analyze_sense_data(drive, NULL, sense); | 273 | cdrom_analyze_sense_data(drive, NULL, sense); |
282 | } | 274 | } |