2.6.24.4

 drivers

 block

diff --git a/drivers/block/ub.c b/drivers/block/ub.c
index 08e909d..7aca466 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)
    if ((cmd = ub_get_cmd(lun)) == NULL)
       return -1;
    memset(cmd, 0, sizeof(struct ub_scsi_cmd));
-   sg_init_table(cmd->sgv, UB_MAX_REQ_SG);
 
    blkdev_dequeue_request(rq);
 
@@ -668,6 +667,7 @@ static int ub_request_fn_1(struct ub_lun *lun, struct request *rq)
    /*
     * get scatterlist from block layer
     */
+   sg_init_table(&urq->sgv[0], UB_MAX_REQ_SG);
    n_elem = blk_rq_map_sg(lun->disk->queue, rq, &urq->sgv[0]);
    if (n_elem < 0) {
       /* Impossible, because blk_rq_map_sg should not hit ENOMEM. */