Commit e2936b2a authored Dec 29, 2011 by Artem Bityutskiy Committed by David Woodhouse Jan 09, 2012

mtd: do not use mtd->lock_user_prot_reg directly

Instead, check the -EOPNOTSUPP return code of 'mtd_lock_user_prot_reg()'.

Signed-off-by: Artem Bityutskiy <artem.bityutskiy@linux.intel.com>
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>

parent 27c151a5

drivers/mtd/mtdchar.c

+0 −2

Original line number	Diff line number	Diff line
		@@ -949,8 +949,6 @@ static int mtdchar_ioctl(struct file *file, u_int cmd, u_long arg)
		return -EINVAL;
		if (copy_from_user(&oinfo, argp, sizeof(oinfo)))
		return -EFAULT;
		if (!mtd->lock_user_prot_reg)
		return -EOPNOTSUPP;
		ret = mtd_lock_user_prot_reg(mtd, oinfo.start, oinfo.length);
		break;
		}

include/linux/mtd/mtd.h

+2 −0

Original line number	Diff line number	Diff line
		@@ -389,6 +389,8 @@ static inline int mtd_write_user_prot_reg(struct mtd_info *mtd, loff_t to,
		static inline int mtd_lock_user_prot_reg(struct mtd_info *mtd, loff_t from,
		size_t len)
		{
		if (!mtd->lock_user_prot_reg)
		return -EOPNOTSUPP;
		return mtd->lock_user_prot_reg(mtd, from, len);
		}