diff --git a/[refs] b/[refs] index dcabfb2a4b86..eb63b517ee44 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 94576b22ce1ad346cb09f05bf4f06be33e0eef49 +refs/heads/master: 0bb08107edb3d38b89be8fb623b46df73f2aa8c8 diff --git a/trunk/drivers/block/viodasd.c b/trunk/drivers/block/viodasd.c index f1c8feb5510b..1730d29e6044 100644 --- a/trunk/drivers/block/viodasd.c +++ b/trunk/drivers/block/viodasd.c @@ -249,7 +249,6 @@ static int send_request(struct request *req) struct HvLpEvent *hev; struct scatterlist sg[VIOMAXBLOCKDMA]; int sgindex; - int statindex; struct viodasd_device *d; unsigned long flags; @@ -258,11 +257,9 @@ static int send_request(struct request *req) if (rq_data_dir(req) == READ) { direction = DMA_FROM_DEVICE; viocmd = viomajorsubtype_blockio | vioblockread; - statindex = 0; } else { direction = DMA_TO_DEVICE; viocmd = viomajorsubtype_blockio | vioblockwrite; - statindex = 1; } d = req->rq_disk->private_data;