diff --git a/[refs] b/[refs]
index 7f51a640a0f0..9e1511f2fec0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 07555c9880da3e2e96e5eae00a03b44cc076deaf
+refs/heads/master: 5a5990d3090b03745a9548a6f5edef02095675cf
diff --git a/trunk/net/core/net-sysfs.c b/trunk/net/core/net-sysfs.c
index 6ac29a46e23e..484f58750eba 100644
--- a/trunk/net/core/net-sysfs.c
+++ b/trunk/net/core/net-sysfs.c
@@ -77,7 +77,9 @@ static ssize_t netdev_store(struct device *dev, struct device_attribute *attr,
 	if (endp == buf)
 		goto err;
 
-	rtnl_lock();
+	if (!rtnl_trylock())
+		return -ERESTARTSYS;
+
 	if (dev_isalive(net)) {
 		if ((ret = (*set)(net, new)) == 0)
 			ret = len;