diff options
| author |   José Pekkarinen <jose.pekkarinen@nokia.com> | 2016-04-11 10:41:07 +0300 |
|---|---|---|
| committer | José Pekkarinen <jose.pekkarinen@nokia.com> | 2016-04-13 08:17:18 +0300 |
| commit | e09b41010ba33a20a87472ee821fa407a5b8da36 (patch) | |
| tree | d10dc367189862e7ca5c592f033dc3726e1df4e3 /kernel/drivers/misc/hwlat_detector.c | |
| parent | f93b97fd65072de626c074dbe099a1fff05ce060 (diff) | |
These changes are the raw update to linux-4.4.6-rt14. Kernel sources
are taken from kernel.org, and rt patch from the rt wiki download page.
During the rebasing, the following patch collided:
Force tick interrupt and get rid of softirq magic(I70131fb85).
Collisions have been removed because its logic was found on the
source already.
Change-Id: I7f57a4081d9deaa0d9ccfc41a6c8daccdee3b769
Signed-off-by: José Pekkarinen <jose.pekkarinen@nokia.com>
Diffstat (limited to 'kernel/drivers/misc/hwlat_detector.c')
| -rw-r--r-- | kernel/drivers/misc/hwlat_detector.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/kernel/drivers/misc/hwlat_detector.c b/kernel/drivers/misc/hwlat_detector.c index 2429c4331..52f5ad5fd 100644 --- a/kernel/drivers/misc/hwlat_detector.c +++ b/kernel/drivers/misc/hwlat_detector.c @@ -616,7 +616,7 @@ static ssize_t debug_enable_fwrite(struct file *filp, buf[sizeof(buf)-1] = '\0'; /* just in case */ err = kstrtoul(buf, 10, &val); - if (0 != err) + if (err) return -EINVAL; if (val) { @@ -921,7 +921,7 @@ static ssize_t debug_width_fwrite(struct file *filp, buf[U64STR_SIZE-1] = '\0'; /* just in case */ err = kstrtoull(buf, 10, &val); - if (0 != err) + if (err) return -EINVAL; mutex_lock(&data.lock); @@ -1005,7 +1005,7 @@ static ssize_t debug_window_fwrite(struct file *filp, buf[U64STR_SIZE-1] = '\0'; /* just in case */ err = kstrtoull(buf, 10, &val); - if (0 != err) + if (err) return -EINVAL; mutex_lock(&data.lock); @@ -1198,11 +1198,11 @@ static int detector_init(void) pr_info(BANNER "version %s\n", VERSION); ret = init_stats(); - if (0 != ret) + if (ret) goto out; ret = init_debugfs(); - if (0 != ret) + if (ret) goto err_stats; if (enabled) |