projects
/
deliverable
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelv...
[deliverable/linux.git]
/
net
/
bridge
/
br_sysfs_if.c
diff --git
a/net/bridge/br_sysfs_if.c
b/net/bridge/br_sysfs_if.c
index 02b2d50cce4da640f4b62a6652253d217e890af2..4a3cdf8f38131e6b19adf330a0e697a307a39e16 100644
(file)
--- a/
net/bridge/br_sysfs_if.c
+++ b/
net/bridge/br_sysfs_if.c
@@
-189,7
+189,8
@@
static ssize_t brport_store(struct kobject * kobj,
val = simple_strtoul(buf, &endp, 0);
if (endp != buf) {
- rtnl_lock();
+ if (!rtnl_trylock())
+ return restart_syscall();
if (p->dev && p->br && brport_attr->store) {
spin_lock_bh(&p->br->lock);
ret = brport_attr->store(p, val);
This page took
0.025694 seconds
and
5
git commands to generate.