Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block

* 'for-linus' of git://git.kernel.dk/linux-2.6-block:
  scatterlist: add more safeguards
  Revert "ll_rw_blk: temporarily enable max_segments tweaking"
  mmc: Add missing sg_init_table() call
  block: Fix memory leak in alloc_disk_node()
  alpha: fix sg_page breakage
  blktrace: Make sure BLKTRACETEARDOWN does the full cleanup.

1 files changed, 2 insertions, 1 deletions

diff --git a/drivers/mmc/card/queue.c b/drivers/mmc/card/queue.c
index 1b9c9b6da5..30cd13b13a 100644
--- a/drivers/mmc/card/queue.c
+++ b/drivers/mmc/card/queue.c
@@ -180,12 +180,13 @@ int mmc_init_queue(struct mmc_queue *mq, struct mmc_card *card, spinlock_t *lock
                 blk_queue_max_hw_segments(mq->queue, host->max_hw_segs);
                 blk_queue_max_segment_size(mq->queue, host->max_seg_size);
 
-                mq->sg = kzalloc(sizeof(struct scatterlist) *
+                mq->sg = kmalloc(sizeof(struct scatterlist) *
                         host->max_phys_segs, GFP_KERNEL);
                 if (!mq->sg) {
                         ret = -ENOMEM;
                         goto cleanup_queue;
                 }
+                sg_init_table(mq->sg, host->max_phys_segs);
         }
 
         init_MUTEX(&mq->thread_sem);