summaryrefslogtreecommitdiff
path: root/drivers/net
diff options
context:
space:
mode:
authorRich Schmitt <B43082@freescale.com>2014-10-27 16:23:12 (GMT)
committerMatthew Weigel <Matthew.Weigel@freescale.com>2014-12-11 18:35:29 (GMT)
commita53aca56e29a3c4f2c76ac37740d586504676793 (patch)
tree80c2098ee4355100f171583063b37d245fd74444 /drivers/net
parentcab0484823cf0e7ea7af0ef726a5b2585148916c (diff)
parent80ea45fc97cecfb194c1658486d2168d09f71224 (diff)
downloadlinux-fsl-qoriq-a53aca56e29a3c4f2c76ac37740d586504676793.tar.xz
Merge tag 'pull-req-to-sdk-v1.7-20141022' of ssh://git.am.freescale.net:29418/sdk/dpaa
Changes will be merged into SDK1.7 branch master.
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/ethernet/freescale/dpa/dpaa_eth_common.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/freescale/dpa/dpaa_eth_common.c b/drivers/net/ethernet/freescale/dpa/dpaa_eth_common.c
index 0a2cdfc..8bd25d5 100644
--- a/drivers/net/ethernet/freescale/dpa/dpaa_eth_common.c
+++ b/drivers/net/ethernet/freescale/dpa/dpaa_eth_common.c
@@ -751,7 +751,7 @@ void dpa_bp_drain(struct dpa_bp *bp)
struct bm_buffer bmb[8];
int i;
- ret = bman_acquire(bp->pool, bmb, 8, 0);
+ ret = bman_acquire(bp->pool, bmb, num, 0);
if (ret < 0) {
if (num == 8) {
/* we have less than 8 buffers left;