diff options
| author | Brian Norris <computersforpeace@gmail.com> | 2017-02-08 15:00:24 -0800 |
|---|---|---|
| committer | Brian Norris <computersforpeace@gmail.com> | 2017-02-08 15:00:24 -0800 |
| commit | 9c8d7ff32a0aa001ac8506180e1662ecdf927f32 (patch) | |
| tree | 65f44bde4c200c7485479d59df550815371c0ab0 /kernel/sysctl.c | |
| parent | 5d708ecc6c7718c22bcacabff0fbb32ecd19ad6b (diff) | |
| parent | a4077ce5871304f8a78f80b74b18b6052a410f1a (diff) | |
Merge tag 'nand/for-4.11' of github.com:linux-nand/linux
From Boris:
"""
This pull request contains minor fixes/improvements on existing drivers:
- sunxi: avoid busy-waiting for NAND events
- ifc: fix ECC handling on IFC v1.0
- OX820: add explicit dependency on ARCH_OXNAS in Kconfig
- core: add a new manufacture ID and fix a kernel-doc warning
- fsmc: kill pdata support
- lpc32xx_slc: remove unneeded NULL check
"""
Conflicts:
include/linux/mtd/nand.h
[Brian: trivial conflict in the comment section]
Diffstat (limited to 'kernel/sysctl.c')
| -rw-r--r-- | kernel/sysctl.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/kernel/sysctl.c b/kernel/sysctl.c index 8dbaec0e4f7f..1aea594a54db 100644 --- a/kernel/sysctl.c +++ b/kernel/sysctl.c @@ -2475,6 +2475,7 @@ static int __do_proc_doulongvec_minmax(void *data, struct ctl_table *table, int break; if (neg) continue; + val = convmul * val / convdiv; if ((min && val < *min) || (max && val > *max)) continue; *i = val; |