From: Bartlomiej Zolnierkiewicz <bzolnier@xxxxxxxxx>
Subject: [PATCH] ide-cd: cleanup ide_cd_do_request()
There should be no functional changes caused by this patch.
Cc: Borislav Petkov <petkovbb@xxxxxxxxx>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@xxxxxxxxx>
---
drivers/ide/ide-cd.c | 15 ++++++---------
1 file changed, 6 insertions(+), 9 deletions(-)
Index: b/drivers/ide/ide-cd.c
===================================================================
--- a/drivers/ide/ide-cd.c
+++ b/drivers/ide/ide-cd.c
@@ -1044,8 +1044,11 @@ static ide_startstop_t ide_cd_do_request
if (blk_fs_request(rq)) {
if (cdrom_start_rw(drive, rq) == ide_stopped ||
- ide_cd_prepare_rw_request(drive, rq) == ide_stopped)
+ ide_cd_prepare_rw_request(drive, rq) == ide_stopped) {
+ if (rq->current_nr_sectors == 0)
+ uptodate = 1;
goto out_end;
+ }
} else if (blk_sense_request(rq) || blk_pc_request(rq) ||
rq->cmd_type == REQ_TYPE_ATA_PC) {
if (!rq->timeout)
@@ -1058,6 +1061,8 @@ static ide_startstop_t ide_cd_do_request
goto out_end;
} else {
blk_dump_rq_flags(rq, DRV_NAME " bad flags");
+ if (rq->errors == 0)
+ rq->errors = -EIO;
goto out_end;
}
@@ -1070,14 +1075,6 @@ static ide_startstop_t ide_cd_do_request
return ide_issue_pc(drive, &cmd);
out_end:
- if (blk_fs_request(rq)) {
- if (rq->current_nr_sectors == 0)
- uptodate = 1;
- } else {
- if (uptodate <= 0 && rq->errors == 0)
- rq->errors = -EIO;
- }
-
nsectors = rq->hard_nr_sectors;
if (nsectors == 0)
--
To unsubscribe from this list: send the line "unsubscribe linux-ide" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
