diff options
Diffstat (limited to 'net/bridge/br_sysfs_if.c')
-rw-r--r-- | net/bridge/br_sysfs_if.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/bridge/br_sysfs_if.c b/net/bridge/br_sysfs_if.c index 02b2d50cce4d..4a3cdf8f3813 100644 --- 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, | |||
189 | 189 | ||
190 | val = simple_strtoul(buf, &endp, 0); | 190 | val = simple_strtoul(buf, &endp, 0); |
191 | if (endp != buf) { | 191 | if (endp != buf) { |
192 | rtnl_lock(); | 192 | if (!rtnl_trylock()) |
193 | return restart_syscall(); | ||
193 | if (p->dev && p->br && brport_attr->store) { | 194 | if (p->dev && p->br && brport_attr->store) { |
194 | spin_lock_bh(&p->br->lock); | 195 | spin_lock_bh(&p->br->lock); |
195 | ret = brport_attr->store(p, val); | 196 | ret = brport_attr->store(p, val); |