diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2016-10-25 18:16:20 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-10-29 14:53:48 -0400 |
| commit | a4256bc9ec36159e84d710c7c44aaa244a6380a8 (patch) | |
| tree | 1b58dfbb740c7538f51aeb9a1bab1aba8f5e5198 /drivers/net/ethernet | |
| parent | ae148b085876fa771d9ef2c05f85d4b4bf09ce0d (diff) | |
| download | blackbird-obmc-linux-a4256bc9ec36159e84d710c7c44aaa244a6380a8.tar.gz blackbird-obmc-linux-a4256bc9ec36159e84d710c7c44aaa244a6380a8.zip | |
IB/mlx4: avoid a -Wmaybe-uninitialize warning
There is an old warning about mlx4_SW2HW_EQ_wrapper on x86:
ethernet/mellanox/mlx4/resource_tracker.c: In function ‘mlx4_SW2HW_EQ_wrapper’:
ethernet/mellanox/mlx4/resource_tracker.c:3071:10: error: ‘eq’ may be used uninitialized in this function [-Werror=maybe-uninitialized]
The problem here is that gcc won't track the state of the variable
across a spin_unlock. Moving the assignment out of the lock is
safe here and avoids the warning.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Reviewed-by: Yishai Hadas <yishaih@mellanox.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet')
| -rw-r--r-- | drivers/net/ethernet/mellanox/mlx4/resource_tracker.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/net/ethernet/mellanox/mlx4/resource_tracker.c b/drivers/net/ethernet/mellanox/mlx4/resource_tracker.c index 84d7857ccc27..c548beaaf910 100644 --- a/drivers/net/ethernet/mellanox/mlx4/resource_tracker.c +++ b/drivers/net/ethernet/mellanox/mlx4/resource_tracker.c @@ -1605,13 +1605,14 @@ static int eq_res_start_move_to(struct mlx4_dev *dev, int slave, int index, r->com.from_state = r->com.state; r->com.to_state = state; r->com.state = RES_EQ_BUSY; - if (eq) - *eq = r; } } spin_unlock_irq(mlx4_tlock(dev)); + if (!err && eq) + *eq = r; + return err; } |
