Commit 936d8592 authored by Pierre Ossman's avatar Pierre Ossman Committed by Russell King

[MMC] Use command class to determine read-only status

If a card doesn't support the "write block" command class then
any attempts to open the device should reflect this by denying
write access.
Signed-off-by: default avatarPierre Ossman <drzeus@drzeus.cx>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 9e1d98c5
...@@ -85,6 +85,12 @@ static void mmc_blk_put(struct mmc_blk_data *md) ...@@ -85,6 +85,12 @@ static void mmc_blk_put(struct mmc_blk_data *md)
up(&open_lock); 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) static int mmc_blk_open(struct inode *inode, struct file *filp)
{ {
struct mmc_blk_data *md; struct mmc_blk_data *md;
...@@ -97,7 +103,7 @@ static int mmc_blk_open(struct inode *inode, struct file *filp) ...@@ -97,7 +103,7 @@ static int mmc_blk_open(struct inode *inode, struct file *filp)
ret = 0; ret = 0;
if ((filp->f_mode & FMODE_WRITE) && if ((filp->f_mode & FMODE_WRITE) &&
mmc_card_readonly(md->queue.card)) mmc_blk_readonly(md->queue.card))
ret = -EROFS; ret = -EROFS;
} }
...@@ -410,7 +416,7 @@ static int mmc_blk_probe(struct mmc_card *card) ...@@ -410,7 +416,7 @@ static int mmc_blk_probe(struct mmc_card *card)
printk(KERN_INFO "%s: %s %s %dKiB %s\n", printk(KERN_INFO "%s: %s %s %dKiB %s\n",
md->disk->disk_name, mmc_card_id(card), mmc_card_name(card), md->disk->disk_name, mmc_card_id(card), mmc_card_name(card),
(card->csd.capacity << card->csd.read_blkbits) / 1024, (card->csd.capacity << card->csd.read_blkbits) / 1024,
mmc_card_readonly(card)?"(ro)":""); mmc_blk_readonly(card)?"(ro)":"");
mmc_set_drvdata(card, md); mmc_set_drvdata(card, md);
add_disk(md->disk); add_disk(md->disk);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment