git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge remote-tracking branches 'asoc/topic/inntel', 'asoc/topic/input', 'asoc/topic...
[sfrench/cifs-2.6.git]
/
drivers
/
net
/
ethernet
/
broadcom
/
bnxt
/
bnxt.c
diff --git
a/drivers/net/ethernet/broadcom/bnxt/bnxt.c
b/drivers/net/ethernet/broadcom/bnxt/bnxt.c
index ee1a803aa11a3cb505a5b95efcf6069fa01ae201..f08a20b921e7a66f7738c65becb9993523452634 100644
(file)
--- a/
drivers/net/ethernet/broadcom/bnxt/bnxt.c
+++ b/
drivers/net/ethernet/broadcom/bnxt/bnxt.c
@@
-4120,7
+4120,7
@@
static int bnxt_hwrm_stat_ctx_alloc(struct bnxt *bp)
bp->grp_info[i].fw_stats_ctx = cpr->hw_stats_ctx_id;
}
mutex_unlock(&bp->hwrm_cmd_lock);
- return
0
;
+ return
rc
;
}
static int bnxt_hwrm_func_qcfg(struct bnxt *bp)