[PATCH] Staging: silicom: fix dangerous if condition in bpctl_mod.c

From: Neil Armstrong
Date: Tue Apr 01 2014 - 09:04:01 EST


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 <superna9999@xxxxxxxxx>
---
drivers/staging/silicom/bpctl_mod.c | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/drivers/staging/silicom/bpctl_mod.c b/drivers/staging/silicom/bpctl_mod.c
index 6b9365b..3b4db2a 100644
--- a/drivers/staging/silicom/bpctl_mod.c
+++ b/drivers/staging/silicom/bpctl_mod.c
@@ -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)
--
1.7.0.4
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/