projects
/
firefly-linux-kernel-4.4.55.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
00fc9d5
)
Revert "mmc: block: ioctl return EINVAL if cmd unknown"
author
Huang, Tao
<huangtao@rock-chips.com>
Tue, 29 Mar 2016 11:40:03 +0000
(19:40 +0800)
committer
Huang, Tao
<huangtao@rock-chips.com>
Tue, 29 Mar 2016 11:40:03 +0000
(19:40 +0800)
This reverts commit
7c1abbfe2a27bae41202d4b46687f82eba0c1d5b
.
Will fixes by aosp commit "mmc: block: fix ABI regression of mmc_blk_ioctl"
Signed-off-by: Huang, Tao <huangtao@rock-chips.com>
drivers/mmc/card/block.c
patch
|
blob
|
history
diff --git
a/drivers/mmc/card/block.c
b/drivers/mmc/card/block.c
index 6efc81ea5dc5d2a6afebb1bf251c5c733e254f3e..7befdaee555a67bc3b01d5a48cc0f397d2e0ce0a 100644
(file)
--- a/
drivers/mmc/card/block.c
+++ b/
drivers/mmc/card/block.c
@@
-690,11
+690,6
@@
cmd_err:
static int mmc_blk_ioctl(struct block_device *bdev, fmode_t mode,
unsigned int cmd, unsigned long arg)
{
-#ifdef CONFIG_ARCH_ROCKCHIP
- if (cmd != MMC_IOC_CMD && cmd != MMC_IOC_MULTI_CMD)
- return -EINVAL;
-#endif
-
/*
* The caller must have CAP_SYS_RAWIO, and must be calling this on the
* whole block device, not on a partition. This prevents overspray