projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'arc-4.8-rc4-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc
[cascardo/linux.git]
/
drivers
/
w1
/
w1.c
diff --git
a/drivers/w1/w1.c
b/drivers/w1/w1.c
index
89a7847
..
bb34362
100644
(file)
--- a/
drivers/w1/w1.c
+++ b/
drivers/w1/w1.c
@@
-335,7
+335,7
@@
static ssize_t w1_master_attribute_store_max_slave_count(struct device *dev,
int tmp;
struct w1_master *md = dev_to_w1_master(dev);
- if (kstrtoint(buf, 0, &tmp)
== -EINVAL
|| tmp < 1)
+ if (kstrtoint(buf, 0, &tmp) || tmp < 1)
return -EINVAL;
mutex_lock(&md->mutex);