The patch titled
     mmc: add missing sg_init_table() call
has been added to the -mm tree.  Its filename is
     mmc-add-missing-sg_init_table-call.patch

*** Remember to use Documentation/SubmitChecklist when testing your code ***

See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this

------------------------------------------------------
Subject: mmc: add missing sg_init_table() call
From: Haavard Skinnemoen <[EMAIL PROTECTED]>

mmc_init_queue only initializes the scatterlists with sg_init_table() when
using a bounce buffer.  This leads to a BUG() when CONFIG_DEBUG_SG is set.

Signed-off-by: Haavard Skinnemoen <[EMAIL PROTECTED]>
Cc: Pierre Ossman <[EMAIL PROTECTED]>
Cc: Jens Axboe <[EMAIL PROTECTED]>
Signed-off-by: Andrew Morton <[EMAIL PROTECTED]>
---

 drivers/mmc/card/queue.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff -puN drivers/mmc/card/queue.c~mmc-add-missing-sg_init_table-call 
drivers/mmc/card/queue.c
--- a/drivers/mmc/card/queue.c~mmc-add-missing-sg_init_table-call
+++ a/drivers/mmc/card/queue.c
@@ -180,12 +180,13 @@ int mmc_init_queue(struct mmc_queue *mq,
                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);
_

Patches currently in -mm which might be from [EMAIL PROTECTED] are

atmel_spi-labels-gpios-better.patch
git-avr32.patch
git-mtd.patch
mmc-add-missing-sg_init_table-call.patch
read_current_time-cleanups.patch
atmel_spi-throughput-improvement.patch
atmel_spi-chain-dma-transfers.patch
atmel_spi-fix-dmachain-oops-with-debug-enabled.patch
generic-gpio-gpio_chip-support.patch
avr32-uses-gpio_chip.patch
mcp23s08-spi-gpio-expander.patch
mcp23s08-spi-gpio-expander-checkpatch-fixes.patch
sanitize-the-type-of-struct-useru_ar0.patch
add-cmpxchg_local-to-avr32.patch
tty-let-architectures-override-the-user-kernel-macros.patch

-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to