From: Peng Li <lipeng321@huawei.com>
Date: Tue, 1 Jun 2021 13:23:21 +0000 (+0800)
Subject: net: hdlc: move out assignment in if condition
X-Git-Tag: v5.14-rc1~119^2~388^2~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e50eb6c3578c6bd7c43c30bfa40a882f0815a2d2;p=thirdparty%2Flinux.git

net: hdlc: move out assignment in if condition

Should not use assignment in if condition.

Signed-off-by: Peng Li <lipeng321@huawei.com>
Signed-off-by: Guangbin Huang <huangguangbin2@huawei.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
---

diff --git a/drivers/net/wan/hdlc.c b/drivers/net/wan/hdlc.c
index fefc7321c0c4f..f48d70e7f3ba1 100644
--- a/drivers/net/wan/hdlc.c
+++ b/drivers/net/wan/hdlc.c
@@ -212,7 +212,8 @@ int hdlc_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
 	/* Not handled by currently attached protocol (if any) */
 
 	while (proto) {
-		if ((result = proto->ioctl(dev, ifr)) != -EINVAL)
+		result = proto->ioctl(dev, ifr);
+		if (result != -EINVAL)
 			return result;
 		proto = proto->next;
 	}
@@ -363,7 +364,8 @@ static int __init hdlc_module_init(void)
 	int result;
 
 	pr_info("%s\n", version);
-	if ((result = register_netdevice_notifier(&hdlc_notifier)) != 0)
+	result = register_netdevice_notifier(&hdlc_notifier);
+	if (result)
 		return result;
 	dev_add_pack(&hdlc_packet_type);
 	return 0;