[PCMCIA] MPC8xx PCMCIA update

[linux-2.6-omap-h63xx.git] / drivers / mmc / mmc_block.c

diff --git a/drivers/mmc/mmc_block.c b/drivers/mmc/mmc_block.c
index fa83f15fdf161d8eafda24958a8e9ccb6ebc2573..d91fcf7c3178294fbef7bdfd1394efeb35bb4014 100644 (file)
--- a/drivers/mmc/mmc_block.c
+++ b/drivers/mmc/mmc_block.c
@@ -85,6 +85,12 @@ static void mmc_blk_put(struct mmc_blk_data *md)
        up(&open_lock);
 }
 
+static inline int mmc_blk_readonly(struct mmc_card *card)
+{
+       return mmc_card_readonly(card) ||
+              !(card->csd.cmdclass & CCC_BLOCK_WRITE);
+}
+
 static int mmc_blk_open(struct inode *inode, struct file *filp)
 {
        struct mmc_blk_data *md;
@@ -97,7 +103,7 @@ static int mmc_blk_open(struct inode *inode, struct file *filp)
                ret = 0;
 
                if ((filp->f_mode & FMODE_WRITE) &&
-                       mmc_card_readonly(md->queue.card))
+                       mmc_blk_readonly(md->queue.card))
                        ret = -EROFS;
        }
 
@@ -197,7 +203,6 @@ static int mmc_blk_issue_rq(struct mmc_queue *mq, struct request *req)
                        brq.data.flags |= MMC_DATA_READ;
                } else {
                        brq.cmd.opcode = MMC_WRITE_BLOCK;
-                       brq.cmd.flags = MMC_RSP_R1B;
                        brq.data.flags |= MMC_DATA_WRITE;
                        brq.data.blocks = 1;
                }
@@ -410,7 +415,7 @@ static int mmc_blk_probe(struct mmc_card *card)
        printk(KERN_INFO "%s: %s %s %dKiB %s\n",
                md->disk->disk_name, mmc_card_id(card), mmc_card_name(card),
                (card->csd.capacity << card->csd.read_blkbits) / 1024,
-               mmc_card_readonly(card)?"(ro)":"");
+               mmc_blk_readonly(card)?"(ro)":"");
 
        mmc_set_drvdata(card, md);
        add_disk(md->disk);