From: Huang, Tao Date: Tue, 29 Mar 2016 11:40:03 +0000 (+0800) Subject: Revert "mmc: block: ioctl return EINVAL if cmd unknown" X-Git-Tag: firefly_0821_release~2959 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=a43f5002cdaad6bc00ba36c386ca6eec3def4ff5;p=firefly-linux-kernel-4.4.55.git Revert "mmc: block: ioctl return EINVAL if cmd unknown" This reverts commit 7c1abbfe2a27bae41202d4b46687f82eba0c1d5b. Will fixes by aosp commit "mmc: block: fix ABI regression of mmc_blk_ioctl" Signed-off-by: Huang, Tao --- diff --git a/drivers/mmc/card/block.c b/drivers/mmc/card/block.c index 6efc81ea5dc5..7befdaee555a 100644 --- 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