Merge git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable

[sfrench/cifs-2.6.git] / drivers / net / cxgb3 / t3_hw.c

diff --git a/drivers/net/cxgb3/t3_hw.c b/drivers/net/cxgb3/t3_hw.c
index e1bd690ff831baa9fb85d52a1532a78284222d47..4f68aeb2679adcbf0f11a617ab815fa06a6bb9f5 100644 (file)
--- a/drivers/net/cxgb3/t3_hw.c
+++ b/drivers/net/cxgb3/t3_hw.c
@@ -3779,7 +3779,7 @@ int t3_prep_adapter(struct adapter *adapter, const struct adapter_info *ai,
 
        adapter->params.info = ai;
        adapter->params.nports = ai->nports0 + ai->nports1;
-       adapter->params.chan_map = !!ai->nports0 | (!!ai->nports1 << 1);
+       adapter->params.chan_map = (!!ai->nports0) | (!!ai->nports1 << 1);
        adapter->params.rev = t3_read_reg(adapter, A_PL_REV);
        /*
         * We used to only run the "adapter check task" once a second if