diff --git a/[refs] b/[refs]
index e8a7335bdd52..7b3a88c9c6de 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 98cddbfb3218925c35697562f7d9df692bf6a436
+refs/heads/master: 25c0a7b83297f10186a7a1ee5c563f005dfabc44
diff --git a/trunk/drivers/block/viodasd.c b/trunk/drivers/block/viodasd.c
index 9e61fca46117..41ca721d2523 100644
--- a/trunk/drivers/block/viodasd.c
+++ b/trunk/drivers/block/viodasd.c
@@ -528,8 +528,7 @@ static int block_event_to_scatterlist(const struct vioblocklpevent *bevent,
 		numsg = VIOMAXBLOCKDMA;
 
 	*total_len = 0;
-	memset(sg, 0, sizeof(sg[0]) * VIOMAXBLOCKDMA);
-
+	sg_init_table(sg, VIOMAXBLOCKDMA);
 	for (i = 0; (i < numsg) && (rw_data->dma_info[i].len > 0); ++i) {
 		sg_dma_address(&sg[i]) = rw_data->dma_info[i].token;
 		sg_dma_len(&sg[i]) = rw_data->dma_info[i].len;