aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/ide/ide-atapi.c
diff options
context:
space:
mode:
authorChristoph Hellwig <hch@lst.de>2010-06-19 17:26:47 +0200
committerJens Axboe <jaxboe@fusionio.com>2010-08-07 18:22:29 +0200
commit4c4762d10faf93167b84ee03e4b58dd62012b06f (patch)
tree5819c7acb3e457885e77edf124196e62b09fd387 /drivers/ide/ide-atapi.c
parent15fa6e81650a167f82dc0d478f290f1cffa9183d (diff)
downloadkernel_samsung_smdk4412-4c4762d10faf93167b84ee03e4b58dd62012b06f.zip
kernel_samsung_smdk4412-4c4762d10faf93167b84ee03e4b58dd62012b06f.tar.gz
kernel_samsung_smdk4412-4c4762d10faf93167b84ee03e4b58dd62012b06f.tar.bz2
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.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/ide/ide-atapi.c b/drivers/ide/ide-atapi.c
index 3117a89..e88a2cf 100644
--- a/drivers/ide/ide-atapi.c
+++ b/drivers/ide/ide-atapi.c
@@ -307,7 +307,7 @@ EXPORT_SYMBOL_GPL(ide_cd_expiry);
int ide_cd_get_xferlen(struct request *rq)
{
- switch (rq->cmd_type)
+ switch (rq->cmd_type) {
case REQ_TYPE_FS:
return 32768;
case REQ_TYPE_SENSE:
@@ -477,12 +477,12 @@ static ide_startstop_t ide_pc_intr(ide_drive_t *drive)
if (uptodate == 0)
drive->failed_pc = NULL;
- if (rq->cmd_type == REQ_TYPE_SPECIAL)
+ if (rq->cmd_type == REQ_TYPE_SPECIAL) {
rq->errors = 0;
error = 0;
} else {
- if (req->cmd_type != REQ_TYPE_FS && uptodate <= 0) {
+ if (rq->cmd_type != REQ_TYPE_FS && uptodate <= 0) {
if (rq->errors == 0)
rq->errors = -EIO;
}