diff options
author | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2009-03-27 07:46:43 -0400 |
---|---|---|
committer | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2009-03-27 07:46:43 -0400 |
commit | 89f78b3261f7e331e41753ea2459fbb9b60a6f7a (patch) | |
tree | f294393d4d4a1db653c5f0ce7b5504ff589e4a3b /drivers/ide/ide-atapi.c | |
parent | 6902a5331256e1b9f4cef95a1e3622252113b260 (diff) |
ide: move rq->errors quirk out from ide_end_request()
Move rq->errors quirk out from ide_end_request() to its call sites.
There should be no functional changes caused by this patch.
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Diffstat (limited to 'drivers/ide/ide-atapi.c')
-rw-r--r-- | drivers/ide/ide-atapi.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/drivers/ide/ide-atapi.c b/drivers/ide/ide-atapi.c index 5d57af29c4c8..5504a84e9bd6 100644 --- a/drivers/ide/ide-atapi.c +++ b/drivers/ide/ide-atapi.c | |||
@@ -405,8 +405,13 @@ static ide_startstop_t ide_pc_intr(ide_drive_t *drive) | |||
405 | if (blk_special_request(rq)) { | 405 | if (blk_special_request(rq)) { |
406 | rq->errors = 0; | 406 | rq->errors = 0; |
407 | ide_complete_rq(drive, 0); | 407 | ide_complete_rq(drive, 0); |
408 | } else | 408 | } else { |
409 | if (blk_fs_request(rq) == 0 && uptodate <= 0) { | ||
410 | if (rq->errors == 0) | ||
411 | rq->errors = -EIO; | ||
412 | } | ||
409 | ide_end_request(drive, uptodate, 0); | 413 | ide_end_request(drive, uptodate, 0); |
414 | } | ||
410 | 415 | ||
411 | return ide_stopped; | 416 | return ide_stopped; |
412 | } | 417 | } |