5 files changed, 37 insertions, 16 deletions

diff --git a/drivers/mmc/card/block.c b/drivers/mmc/card/block.c
index 86dbb366415a..ebc8b9d77613 100644
--- a/drivers/mmc/card/block.c
+++ b/drivers/mmc/card/block.c
@@ -103,8 +103,10 @@ static int mmc_blk_open(struct inode *inode, struct file *filp)
                         check_disk_change(inode->i_bdev);
                 ret = 0;
 
-                if ((filp->f_mode & FMODE_WRITE) && md->read_only)
+                if ((filp->f_mode & FMODE_WRITE) && md->read_only) {
+                        mmc_blk_put(md);
                         ret = -EROFS;
+                }
         }
 
         return ret;
@@ -613,14 +615,19 @@ static struct mmc_driver mmc_driver = {
 
 static int __init mmc_blk_init(void)
 {
-        int res = -ENOMEM;
+        int res;
 
         res = register_blkdev(MMC_BLOCK_MAJOR, "mmc");
         if (res)
                 goto out;
 
-        return mmc_register_driver(&mmc_driver);
+        res = mmc_register_driver(&mmc_driver);
+        if (res)
+                goto out2;
 
+        return 0;
+ out2:
+        unregister_blkdev(MMC_BLOCK_MAJOR, "mmc");
  out:
         return res;
 }
diff --git a/drivers/mmc/card/mmc_test.c b/drivers/mmc/card/mmc_test.c
index f26b01d811ae..b92b172074ee 100644
--- a/drivers/mmc/card/mmc_test.c
+++ b/drivers/mmc/card/mmc_test.c
@@ -1040,7 +1040,7 @@ static const struct mmc_test_case mmc_test_cases[] = {
 
 };
 
-static struct mutex mmc_test_lock;
+static DEFINE_MUTEX(mmc_test_lock);
 
 static void mmc_test_run(struct mmc_test_card *test, int testcase)
 {
@@ -1171,8 +1171,6 @@ static int mmc_test_probe(struct mmc_card *card)
         if ((card->type != MMC_TYPE_MMC) && (card->type != MMC_TYPE_SD))
                 return -ENODEV;
 
-        mutex_init(&mmc_test_lock);
-
         ret = device_create_file(&card->dev, &dev_attr_test);
         if (ret)
                 return ret;
diff --git a/drivers/mmc/host/at91_mci.c b/drivers/mmc/host/at91_mci.c
index 6915f40ac8ab..1f8b5b36222c 100644
--- a/drivers/mmc/host/at91_mci.c
+++ b/drivers/mmc/host/at91_mci.c
@@ -621,12 +621,21 @@ static void at91_mci_send_command(struct at91mci_host *host, struct mmc_command
                                 if (cpu_is_at91sam9260 () || cpu_is_at91sam9263())
                                         if (host->total_length < 12)
                                                 host->total_length = 12;
-                                host->buffer = dma_alloc_coherent(NULL,
-                                                host->total_length,
-                                                &host->physical_address, GFP_KERNEL);
+
+                                host->buffer = kmalloc(host->total_length, GFP_KERNEL);
+                                if (!host->buffer) {
+                                        pr_debug("Can't alloc tx buffer\n");
+                                        cmd->error = -ENOMEM;
+                                        mmc_request_done(host->mmc, host->request);
+                                        return;
+                                }
 
                                 at91_mci_sg_to_dma(host, data);
 
+                                host->physical_address = dma_map_single(NULL,
+                                                host->buffer, host->total_length,
+                                                DMA_TO_DEVICE);
+
                                 pr_debug("Transmitting %d bytes\n", host->total_length);
 
                                 at91_mci_write(host, ATMEL_PDC_TPR, host->physical_address);
@@ -694,7 +703,10 @@ static void at91_mci_completed_command(struct at91mci_host *host, unsigned int s
         cmd->resp[3] = at91_mci_read(host, AT91_MCI_RSPR(3));
 
         if (host->buffer) {
-                dma_free_coherent(NULL, host->total_length, host->buffer, host->physical_address);
+                dma_unmap_single(NULL,
+                                host->physical_address, host->total_length,
+                                DMA_TO_DEVICE);
+                kfree(host->buffer);
                 host->buffer = NULL;
         }
 
diff --git a/drivers/mmc/host/atmel-mci.c b/drivers/mmc/host/atmel-mci.c
index 0bd06f5bd62f..917035e16da4 100644
--- a/drivers/mmc/host/atmel-mci.c
+++ b/drivers/mmc/host/atmel-mci.c
@@ -195,7 +195,9 @@ static int atmci_regs_show(struct seq_file *s, void *v)
 
         /* Grab a more or less consistent snapshot */
         spin_lock_irq(&host->mmc->lock);
+        clk_enable(host->mck);
         memcpy_fromio(buf, host->regs, MCI_REGS_SIZE);
+        clk_disable(host->mck);
         spin_unlock_irq(&host->mmc->lock);
 
         seq_printf(s, "MR:\t0x%08x%s%s CLKDIV=%u\n",
@@ -216,6 +218,8 @@ static int atmci_regs_show(struct seq_file *s, void *v)
         atmci_show_status_reg(s, "SR", buf[MCI_SR / 4]);
         atmci_show_status_reg(s, "IMR", buf[MCI_IMR / 4]);
 
+        kfree(buf);
+
         return 0;
 }
 
@@ -237,7 +241,6 @@ static void atmci_init_debugfs(struct atmel_mci *host)
         struct mmc_host *mmc;
         struct dentry   *root;
         struct dentry   *node;
-        struct resource *res;
 
         mmc = host->mmc;
         root = mmc->debugfs_root;
@@ -251,9 +254,6 @@ static void atmci_init_debugfs(struct atmel_mci *host)
         if (!node)
                 goto err;
 
-        res = platform_get_resource(host->pdev, IORESOURCE_MEM, 0);
-        node->d_inode->i_size = res->end - res->start + 1;
-
         node = debugfs_create_file("req", S_IRUSR, root, host, &atmci_req_fops);
         if (!node)
                 goto err;
@@ -1059,6 +1059,10 @@ static int __init atmci_probe(struct platform_device *pdev)
                         host->present = !gpio_get_value(host->detect_pin);
                 }
         }
+
+        if (!gpio_is_valid(host->detect_pin))
+                mmc->caps |= MMC_CAP_NEEDS_POLL;
+
         if (gpio_is_valid(host->wp_pin)) {
                 if (gpio_request(host->wp_pin, "mmc_wp")) {
                         dev_dbg(&mmc->class_dev, "no WP pin available\n");
diff --git a/drivers/mmc/host/tmio_mmc.h b/drivers/mmc/host/tmio_mmc.h
index 9e647a06054f..ba2b4240a86a 100644
--- a/drivers/mmc/host/tmio_mmc.h
+++ b/drivers/mmc/host/tmio_mmc.h
@@ -159,10 +159,10 @@ static inline void tmio_mmc_kunmap_atomic(struct tmio_mmc_host *host,
 #define STATUS_TO_TEXT(a) \
         do { \
                 if (status & TMIO_STAT_##a) \
-                        printf(#a); \
+                        printk(#a); \
         } while (0)
 
-void debug_status(u32 status)
+void pr_debug_status(u32 status)
 {
         printk(KERN_DEBUG "status: %08x = ", status);
         STATUS_TO_TEXT(CARD_REMOVE);