From: Dan Carpenter <dan.carpenter@oracle.com>
Date: Fri, 1 Feb 2019 08:24:06 +0000 (+0300)
Subject: ethtool: remove unnecessary check in ethtool_get_regs()
X-Git-Tag: v5.1-rc1~178^2~389
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;ds=sidebyside;h=ef76c77a0561e83d457937621ce2273b0580e345;p=linux-2.6-block.git

ethtool: remove unnecessary check in ethtool_get_regs()

We recently changed this function in commit f9fc54d313fa ("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>
---

diff --git a/net/core/ethtool.c b/net/core/ethtool.c
index 158264f7cfaf..3fe6e9da3579 100644
--- a/net/core/ethtool.c
+++ b/net/core/ethtool.c
@@ -1348,12 +1348,9 @@ static int ethtool_get_regs(struct net_device *dev, char __user *useraddr)
 	if (regs.len > reglen)
 		regs.len = reglen;
 
-	regbuf = NULL;
-	if (reglen) {
-		regbuf = vzalloc(reglen);
-		if (!regbuf)
-			return -ENOMEM;
-	}
+	regbuf = vzalloc(reglen);
+	if (!regbuf)
+		return -ENOMEM;
 
 	ops->get_regs(dev, &regs, regbuf);