diff --git a/[refs] b/[refs] index 3b8eaaad37af..49a21d03db75 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1caf09df78a1b40604f200f419b08819e139b858 +refs/heads/master: e1e420c71b53829c661123a21b14a42d821e5e7f diff --git a/trunk/net/core/net-sysfs.c b/trunk/net/core/net-sysfs.c index 495586232aa1..97d0f2453a0e 100644 --- a/trunk/net/core/net-sysfs.c +++ b/trunk/net/core/net-sysfs.c @@ -74,15 +74,14 @@ static ssize_t netdev_store(struct device *dev, struct device_attribute *attr, int (*set)(struct net_device *, unsigned long)) { struct net_device *net = to_net_dev(dev); - char *endp; unsigned long new; int ret = -EINVAL; if (!capable(CAP_NET_ADMIN)) return -EPERM; - new = simple_strtoul(buf, &endp, 0); - if (endp == buf) + ret = kstrtoul(buf, 0, &new); + if (ret) goto err; if (!rtnl_trylock())