From 4d801527a151c10173254580cd12bed60a122be0 Mon Sep 17 00:00:00 2001 From: Pierre Ossman Date: Sun, 30 Oct 2005 10:15:58 +0000 Subject: [PATCH] --- yaml --- r: 11925 b: refs/heads/master c: 936d8592654bb97d5706a73c0e2a6339b090f7fb h: refs/heads/master i: 11923: a591adda49bd3c1766fd3d3ba3e142380b122924 v: v3 --- [refs] | 2 +- trunk/drivers/mmc/mmc_block.c | 10 ++++++++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 510d65906704..4f450e79ddb9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9e1d98c5d8613d917004a193d4f989a3544d8fef +refs/heads/master: 936d8592654bb97d5706a73c0e2a6339b090f7fb diff --git a/trunk/drivers/mmc/mmc_block.c b/trunk/drivers/mmc/mmc_block.c index fa83f15fdf16..9b629856c735 100644 --- a/trunk/drivers/mmc/mmc_block.c +++ b/trunk/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; } @@ -410,7 +416,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);