Skip to content

Commit ef76c77

Browse files
Dan Carpenterdavem330
authored andcommitted
ethtool: remove unnecessary check in ethtool_get_regs()
We recently changed this function in commit f9fc54d ("ethtool: check the return value of get_regs_len") such that if "reglen" is zero we return directly. That means we can remove this condition as well. Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> Signed-off-by: David S. Miller <davem@davemloft.net>
1 parent fa6821c commit ef76c77

File tree

1 file changed

+3
-6
lines changed

1 file changed

+3
-6
lines changed

net/core/ethtool.c

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1348,12 +1348,9 @@ static int ethtool_get_regs(struct net_device *dev, char __user *useraddr)
13481348
if (regs.len > reglen)
13491349
regs.len = reglen;
13501350

1351-
regbuf = NULL;
1352-
if (reglen) {
1353-
regbuf = vzalloc(reglen);
1354-
if (!regbuf)
1355-
return -ENOMEM;
1356-
}
1351+
regbuf = vzalloc(reglen);
1352+
if (!regbuf)
1353+
return -ENOMEM;
13571354

13581355
ops->get_regs(dev, &regs, regbuf);
13591356

0 commit comments

Comments
 (0)