diff options
Diffstat (limited to 'drivers/block')
-rw-r--r-- | drivers/block/ub.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/block/ub.c b/drivers/block/ub.c index a70c1c29a7aa..c452e2d355ee 100644 --- a/drivers/block/ub.c +++ b/drivers/block/ub.c | |||
@@ -657,7 +657,6 @@ static int ub_request_fn_1(struct ub_lun *lun, struct request *rq) | |||
657 | if ((cmd = ub_get_cmd(lun)) == NULL) | 657 | if ((cmd = ub_get_cmd(lun)) == NULL) |
658 | return -1; | 658 | return -1; |
659 | memset(cmd, 0, sizeof(struct ub_scsi_cmd)); | 659 | memset(cmd, 0, sizeof(struct ub_scsi_cmd)); |
660 | sg_init_table(cmd->sgv, UB_MAX_REQ_SG); | ||
661 | 660 | ||
662 | blkdev_dequeue_request(rq); | 661 | blkdev_dequeue_request(rq); |
663 | 662 | ||
@@ -668,6 +667,7 @@ static int ub_request_fn_1(struct ub_lun *lun, struct request *rq) | |||
668 | /* | 667 | /* |
669 | * get scatterlist from block layer | 668 | * get scatterlist from block layer |
670 | */ | 669 | */ |
670 | sg_init_table(&urq->sgv[0], UB_MAX_REQ_SG); | ||
671 | n_elem = blk_rq_map_sg(lun->disk->queue, rq, &urq->sgv[0]); | 671 | n_elem = blk_rq_map_sg(lun->disk->queue, rq, &urq->sgv[0]); |
672 | if (n_elem < 0) { | 672 | if (n_elem < 0) { |
673 | /* Impossible, because blk_rq_map_sg should not hit ENOMEM. */ | 673 | /* Impossible, because blk_rq_map_sg should not hit ENOMEM. */ |