2 files changed, 5 insertions, 3 deletions

diff --git a/drivers/mmc/card/block.c b/drivers/mmc/card/block.c
index 86dbb366415a..6986f3926244 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;
diff --git a/drivers/mmc/host/pxamci.c b/drivers/mmc/host/pxamci.c
index 55093ad132ca..ebfaa9960939 100644
--- a/drivers/mmc/host/pxamci.c
+++ b/drivers/mmc/host/pxamci.c
@@ -520,7 +520,7 @@ static int pxamci_probe(struct platform_device *pdev)
         /*
          * Block length register is only 10 bits before PXA27x.
          */
-        mmc->max_blk_size = (cpu_is_pxa21x() || cpu_is_pxa25x()) ? 1023 : 2048;
+        mmc->max_blk_size = cpu_is_pxa25x() ? 1023 : 2048;
 
         /*
          * Block count register is 16 bits.
@@ -554,7 +554,7 @@ static int pxamci_probe(struct platform_device *pdev)
                          MMC_VDD_32_33|MMC_VDD_33_34;
         mmc->caps = 0;
         host->cmdat = 0;
-        if (!cpu_is_pxa21x() && !cpu_is_pxa25x()) {
+        if (!cpu_is_pxa25x()) {
                 mmc->caps |= MMC_CAP_4_BIT_DATA | MMC_CAP_SDIO_IRQ;
                 host->cmdat |= CMDAT_SDIO_INT_EN;
                 if (cpu_is_pxa300() || cpu_is_pxa310())