Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a7f38002 authored by Colin Ian King's avatar Colin Ian King Committed by David S. Miller
Browse files

net: hp100: fix always-true check for link up state 



The operation ~(p100_inb(VG_LAN_CFG_1) & HP100_LINK_UP) returns a value
that is always non-zero and hence the wait for the link to drop always
terminates prematurely.  Fix this by using a logical not operator instead
of a bitwise complement.  This issue has been in the driver since
pre-2.6.12-rc2.

Detected by CoverityScan, CID#114157 ("Logical vs. bitwise operator")

Signed-off-by: default avatarColin Ian King <colin.king@canonical.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 321cc359

drivers/net/ethernet/hp/hp100.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -2634,7 +2634,7 @@ static int hp100_login_to_vg_hub(struct net_device *dev, u_short force_relogin) 
		/* Wait for link to drop */

		/* Wait for link to drop */

		time = jiffies + (HZ / 10);

		time = jiffies + (HZ / 10);

		do {

		do {

			if (~(hp100_inb(VG_LAN_CFG_1) & HP100_LINK_UP_ST))

			if (!(hp100_inb(VG_LAN_CFG_1) & HP100_LINK_UP_ST))

				break;

				break;

			if (!in_interrupt())

			if (!in_interrupt())

				schedule_timeout_interruptible(1);

				schedule_timeout_interruptible(1);