diff options
author | Christoph Hellwig <hch@lst.de> | 2010-06-19 11:26:47 -0400 |
---|---|---|
committer | Jens Axboe <jaxboe@fusionio.com> | 2010-08-07 12:22:29 -0400 |
commit | 4c4762d10faf93167b84ee03e4b58dd62012b06f (patch) | |
tree | 5819c7acb3e457885e77edf124196e62b09fd387 /drivers/ide/ide-atapi.c | |
parent | 15fa6e81650a167f82dc0d478f290f1cffa9183d (diff) |
block: fix some more cmd_type cleanup fallout
Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Jens Axboe <jaxboe@fusionio.com>
Diffstat (limited to 'drivers/ide/ide-atapi.c')
-rw-r--r-- | drivers/ide/ide-atapi.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/ide/ide-atapi.c b/drivers/ide/ide-atapi.c index 3117a894d20e..e88a2cf17711 100644 --- a/drivers/ide/ide-atapi.c +++ b/drivers/ide/ide-atapi.c | |||
@@ -307,7 +307,7 @@ EXPORT_SYMBOL_GPL(ide_cd_expiry); | |||
307 | 307 | ||
308 | int ide_cd_get_xferlen(struct request *rq) | 308 | int ide_cd_get_xferlen(struct request *rq) |
309 | { | 309 | { |
310 | switch (rq->cmd_type) | 310 | switch (rq->cmd_type) { |
311 | case REQ_TYPE_FS: | 311 | case REQ_TYPE_FS: |
312 | return 32768; | 312 | return 32768; |
313 | case REQ_TYPE_SENSE: | 313 | case REQ_TYPE_SENSE: |
@@ -477,12 +477,12 @@ static ide_startstop_t ide_pc_intr(ide_drive_t *drive) | |||
477 | if (uptodate == 0) | 477 | if (uptodate == 0) |
478 | drive->failed_pc = NULL; | 478 | drive->failed_pc = NULL; |
479 | 479 | ||
480 | if (rq->cmd_type == REQ_TYPE_SPECIAL) | 480 | if (rq->cmd_type == REQ_TYPE_SPECIAL) { |
481 | rq->errors = 0; | 481 | rq->errors = 0; |
482 | error = 0; | 482 | error = 0; |
483 | } else { | 483 | } else { |
484 | 484 | ||
485 | if (req->cmd_type != REQ_TYPE_FS && uptodate <= 0) { | 485 | if (rq->cmd_type != REQ_TYPE_FS && uptodate <= 0) { |
486 | if (rq->errors == 0) | 486 | if (rq->errors == 0) |
487 | rq->errors = -EIO; | 487 | rq->errors = -EIO; |
488 | } | 488 | } |