Staging: silicom: fix dangerous if condition in bpctl_mod.c

PATCH New Neil Armstrong 1 participant 1 message Apr 1, 2014 Staging

Share & tools

Neil Armstrong

author

2014-04-01 13:03 UTC #0 lore raw

PATCH 1/1 Staging: silicom: fix dangerous if condition in bpctl_mod.c

checkpatch script returns the following warning:
ERROR: do not use assignment in if condition
+ if (((dev_num = get_dev_idx(dev->ifindex)) ==

            -1) |

This patch fixes the if condition by splitting it.

Signed-off-by Neil Armstrong <[email protected]>

---
 drivers/staging/silicom/bpctl_mod.c |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

drivers/staging/silicom/bpctl_mod.c +6 -2

index 6b9365b..3b4db2a 100644
@@ -220,8 +220,12 @@ static int bp_device_event(struct notifier_block *unused,
 			if (netif_carrier_ok(dev))
 				return NOTIFY_DONE;
 
-			if (((dev_num = get_dev_idx(dev->ifindex)) == -1) ||
-			    (!(pbpctl_dev = &bpctl_dev_arr[dev_num])))
+			dev_num = get_dev_idx(dev->ifindex);
+			if (dev_num == -1)
+				return NOTIFY_DONE;
+
+			pbpctl_dev = &bpctl_dev_arr[dev_num];
+			if (!pbpctl_dev)
 				return NOTIFY_DONE;
 
 			if ((is_bypass_fn(pbpctl_dev)) == 1)

Signature · 1 line

1.7.0.4