diff options
author | H. Peter Anvin <hpa@zytor.com> | 2012-05-21 21:17:50 +0200 |
---|---|---|
committer | H. Peter Anvin <hpa@zytor.com> | 2012-05-21 21:17:50 +0200 |
commit | d13a822e6d08733cc69dd8c2f5d82eacb1474295 (patch) | |
tree | 2b39613c0d8cce9eb3b15adb1525a2c72f46d392 /drivers/mtd/mtdchar.c | |
parent | x86, printk: Add missing KERN_CONT to NMI selftest (diff) | |
parent | Linux 3.4 (diff) | |
download | linux-d13a822e6d08733cc69dd8c2f5d82eacb1474295.tar.xz linux-d13a822e6d08733cc69dd8c2f5d82eacb1474295.zip |
Merge commit 'v3.4' into x86/urgent
Diffstat (limited to 'drivers/mtd/mtdchar.c')
-rw-r--r-- | drivers/mtd/mtdchar.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mtd/mtdchar.c b/drivers/mtd/mtdchar.c index 58fc65f5c817..f2f482bec573 100644 --- a/drivers/mtd/mtdchar.c +++ b/drivers/mtd/mtdchar.c @@ -376,7 +376,7 @@ static int otp_select_filemode(struct mtd_file_info *mfi, int mode) * Make a fake call to mtd_read_fact_prot_reg() to check if OTP * operations are supported. */ - if (mtd_read_fact_prot_reg(mtd, -1, -1, &retlen, NULL) == -EOPNOTSUPP) + if (mtd_read_fact_prot_reg(mtd, -1, 0, &retlen, NULL) == -EOPNOTSUPP) return -EOPNOTSUPP; switch (mode) { |