net/wan/fsl_ucc_hdlc: fix incorrect memory allocation
authorHolger Brunck <holger.brunck@keymile.com>
Wed, 17 May 2017 15:24:35 +0000 (17:24 +0200)
committerDavid S. Miller <davem@davemloft.net>
Thu, 18 May 2017 14:28:38 +0000 (10:28 -0400)
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>
drivers/net/wan/fsl_ucc_hdlc.c

index 1a60897767d9f1536e0cdba6c73cf84e94057684..49b91b2c113ca3f1ad5c100c560d64b3a07edb9f 100644 (file)
@@ -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 @@ free_ucc_pram:
        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;