From: Holger Brunck <holger.brunck@keymile.com>
To: netdev@vger.kernel.org
Cc: Holger Brunck <holger.brunck@keymile.com>,
Zhao Qiang <qiang.zhao@nxp.com>
Subject: [PATCH net-next 4/8] net/wan/fsl_ucc_hdlc: fix incorrect memory allocation
Date: Wed, 17 May 2017 17:24:35 +0200 [thread overview]
Message-ID: <20170517152439.8817-4-holger.brunck@keymile.com> (raw)
In-Reply-To: <20170517152439.8817-1-holger.brunck@keymile.com>
We need space for the struct qe_bd and not for a pointer to this struct.
Signed-off-by: Holger Brunck <holger.brunck@keymile.com>
Cc: Zhao Qiang <qiang.zhao@nxp.com>
---
drivers/net/wan/fsl_ucc_hdlc.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/drivers/net/wan/fsl_ucc_hdlc.c b/drivers/net/wan/fsl_ucc_hdlc.c
index 1a60897767d9..49b91b2c113c 100644
--- a/drivers/net/wan/fsl_ucc_hdlc.c
+++ b/drivers/net/wan/fsl_ucc_hdlc.c
@@ -136,7 +136,7 @@ static int uhdlc_init(struct ucc_hdlc_private *priv)
priv->tx_ring_size = TX_BD_RING_LEN;
/* Alloc Rx BD */
priv->rx_bd_base = dma_alloc_coherent(priv->dev,
- RX_BD_RING_LEN * sizeof(struct qe_bd *),
+ RX_BD_RING_LEN * sizeof(struct qe_bd),
&priv->dma_rx_bd, GFP_KERNEL);
if (!priv->rx_bd_base) {
@@ -147,7 +147,7 @@ static int uhdlc_init(struct ucc_hdlc_private *priv)
/* Alloc Tx BD */
priv->tx_bd_base = dma_alloc_coherent(priv->dev,
- TX_BD_RING_LEN * sizeof(struct qe_bd *),
+ TX_BD_RING_LEN * sizeof(struct qe_bd),
&priv->dma_tx_bd, GFP_KERNEL);
if (!priv->tx_bd_base) {
@@ -294,11 +294,11 @@ static int uhdlc_init(struct ucc_hdlc_private *priv)
qe_muram_free(priv->ucc_pram_offset);
free_tx_bd:
dma_free_coherent(priv->dev,
- TX_BD_RING_LEN * sizeof(struct qe_bd *),
+ TX_BD_RING_LEN * sizeof(struct qe_bd),
priv->tx_bd_base, priv->dma_tx_bd);
free_rx_bd:
dma_free_coherent(priv->dev,
- RX_BD_RING_LEN * sizeof(struct qe_bd *),
+ RX_BD_RING_LEN * sizeof(struct qe_bd),
priv->rx_bd_base, priv->dma_rx_bd);
free_uccf:
ucc_fast_free(priv->uccf);
@@ -656,7 +656,7 @@ static void uhdlc_memclean(struct ucc_hdlc_private *priv)
if (priv->rx_bd_base) {
dma_free_coherent(priv->dev,
- RX_BD_RING_LEN * sizeof(struct qe_bd *),
+ RX_BD_RING_LEN * sizeof(struct qe_bd),
priv->rx_bd_base, priv->dma_rx_bd);
priv->rx_bd_base = NULL;
@@ -665,7 +665,7 @@ static void uhdlc_memclean(struct ucc_hdlc_private *priv)
if (priv->tx_bd_base) {
dma_free_coherent(priv->dev,
- TX_BD_RING_LEN * sizeof(struct qe_bd *),
+ TX_BD_RING_LEN * sizeof(struct qe_bd),
priv->tx_bd_base, priv->dma_tx_bd);
priv->tx_bd_base = NULL;
--
2.12.0.rc1
next prev parent reply other threads:[~2017-05-17 15:31 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-05-17 15:24 [PATCH net-next 1/8] net/wan/fsl_ucc_hdlc: cleanup debug traces Holger Brunck
2017-05-17 15:24 ` [PATCH net-next 2/8] net/wan/fsl_ucc_hdlc: fix unitialized variable warnings Holger Brunck
2017-05-18 14:29 ` David Miller
2017-05-17 15:24 ` [PATCH net-next 3/8] net/wan/fsl_ucc_hdlc: fix wrong indentation Holger Brunck
2017-05-18 14:29 ` David Miller
2017-05-17 15:24 ` Holger Brunck [this message]
2017-05-18 14:29 ` [PATCH net-next 4/8] net/wan/fsl_ucc_hdlc: fix incorrect memory allocation David Miller
2017-05-17 15:24 ` [PATCH net-next 5/8] net/wan/fsl_ucc_hdlc: call qe_setbrg only for loopback mode Holger Brunck
2017-05-18 14:29 ` David Miller
2017-05-17 15:24 ` [PATCH net-next 6/8] fsl/qe: add bit description for SYNL register for GUMR Holger Brunck
2017-05-18 14:29 ` David Miller
2017-05-17 15:24 ` [PATCH net-next 7/8] net/wan/fsl_ucc_hdlc: add hdlc-bus support Holger Brunck
2017-05-18 14:29 ` David Miller
2017-05-17 15:24 ` [PATCH net-next 8/8] powerpc/85xx/kmcent2: use hdlc busmode for UCC1 Holger Brunck
2017-05-18 14:29 ` David Miller
2017-05-18 14:29 ` [PATCH net-next 1/8] net/wan/fsl_ucc_hdlc: cleanup debug traces David Miller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170517152439.8817-4-holger.brunck@keymile.com \
--to=holger.brunck@keymile.com \
--cc=netdev@vger.kernel.org \
--cc=qiang.zhao@nxp.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox