diff options
| author | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2009-03-27 12:46:43 +0100 |
|---|---|---|
| committer | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2009-03-27 12:46:43 +0100 |
| commit | 89f78b3261f7e331e41753ea2459fbb9b60a6f7a (patch) | |
| tree | f294393d4d4a1db653c5f0ce7b5504ff589e4a3b /drivers/ide/ide-eh.c | |
| parent | 6902a5331256e1b9f4cef95a1e3622252113b260 (diff) | |
| download | linux-stable-89f78b3261f7e331e41753ea2459fbb9b60a6f7a.tar.gz linux-stable-89f78b3261f7e331e41753ea2459fbb9b60a6f7a.tar.bz2 linux-stable-89f78b3261f7e331e41753ea2459fbb9b60a6f7a.zip | |
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-eh.c')
| -rw-r--r-- | drivers/ide/ide-eh.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/ide/ide-eh.c b/drivers/ide/ide-eh.c index d1385d332e94..6ad419414f95 100644 --- a/drivers/ide/ide-eh.c +++ b/drivers/ide/ide-eh.c @@ -146,8 +146,11 @@ static inline void ide_complete_drive_reset(ide_drive_t *drive, int err) { struct request *rq = drive->hwif->rq; - if (rq && blk_special_request(rq) && rq->cmd[0] == REQ_DRIVE_RESET) + if (rq && blk_special_request(rq) && rq->cmd[0] == REQ_DRIVE_RESET) { + if (err <= 0 && rq->errors == 0) + rq->errors = -EIO; ide_end_request(drive, err ? err : 1, 0); + } } /* needed below */ |