diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2018-01-16 14:50:51 +0100 |
|---|---|---|
| committer | Jon Mason <jdmason@kudzu.us> | 2018-01-28 22:17:23 -0500 |
| commit | c6fad21a8d03167a47fc376a64df785d8f6e7385 (patch) | |
| tree | 0599f5a184caef117fee2e9a06630af2cc560237 /drivers/ntb | |
| parent | 1e2fd202f8593985cdadca32e0c322f98e7fe7cb (diff) | |
| download | talos-op-linux-c6fad21a8d03167a47fc376a64df785d8f6e7385.tar.gz talos-op-linux-c6fad21a8d03167a47fc376a64df785d8f6e7385.zip | |
ntb_hw_switchtec: fix logic error
Newer gcc (version 7 and 8 presumably) warn about a statement mixing
the << operator with logical and:
drivers/ntb/hw/mscc/ntb_hw_switchtec.c: In function 'switchtec_ntb_init_sndev':
drivers/ntb/hw/mscc/ntb_hw_switchtec.c:888:24: error: '<<' in boolean context, did you mean '<' ? [-Werror=int-in-bool-context]
My interpretation here is that the author must have intended a bitmask
rather than a comparison, so I'm changing the '&&' to '&', which makes
a lot more sense in the context.
Fixes: 1b249475275d ("ntb_hw_switchtec: Allow using Switchtec NTB in multi-partition setups")
Reviewed-by: Logan Gunthorpe <logang@deltatee.com>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Jon Mason <jdmason@kudzu.us>
Diffstat (limited to 'drivers/ntb')
| -rw-r--r-- | drivers/ntb/hw/mscc/ntb_hw_switchtec.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/ntb/hw/mscc/ntb_hw_switchtec.c b/drivers/ntb/hw/mscc/ntb_hw_switchtec.c index 6c6f991999b5..a1d547b6aa12 100644 --- a/drivers/ntb/hw/mscc/ntb_hw_switchtec.c +++ b/drivers/ntb/hw/mscc/ntb_hw_switchtec.c @@ -898,7 +898,7 @@ static int switchtec_ntb_init_sndev(struct switchtec_ntb *sndev) } sndev->peer_partition = ffs(tpart_vec) - 1; - if (!(part_map && (1 << sndev->peer_partition))) { + if (!(part_map & (1 << sndev->peer_partition))) { dev_err(&sndev->stdev->dev, "ntb target partition is not NT partition\n"); return -ENODEV; |
