mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-23 17:30:02 +00:00
net/wan/fsl_ucc_hdlc: fix incorrect memory allocation
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> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
10515db509
commit
5b8aad93c5
1 changed files with 6 additions and 6 deletions
|
@ -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;
|
||||
|
|
Loading…
Reference in a new issue