Merge branch 'parisc-3.16-5' of git://git.kernel.org/pub/scm/linux/kernel/git/deller...

[karo-tx-linux.git] / arch / powerpc / sysdev / fsl_rmu.c

diff --git a/arch/powerpc/sysdev/fsl_rmu.c b/arch/powerpc/sysdev/fsl_rmu.c
index 00e224a1048c9ed0a690ad694bdd0c8a84318eed..b48197ae44d0f1ebfb26a8ca4b5d4ca023c5dbce 100644 (file)
--- a/arch/powerpc/sysdev/fsl_rmu.c
+++ b/arch/powerpc/sysdev/fsl_rmu.c
@@ -881,9 +881,9 @@ fsl_open_inb_mbox(struct rio_mport *mport, void *dev_id, int mbox, int entries)
        rc = request_irq(IRQ_RIO_RX(mport), fsl_rio_rx_handler, 0,
                         "msg_rx", (void *)mport);
        if (rc < 0) {
-               dma_free_coherent(priv->dev, RIO_MSG_BUFFER_SIZE,
-                       rmu->msg_tx_ring.virt_buffer[i],
-                       rmu->msg_tx_ring.phys_buffer[i]);
+               dma_free_coherent(priv->dev,
+                       rmu->msg_rx_ring.size * RIO_MAX_MSG_SIZE,
+                       rmu->msg_rx_ring.virt, rmu->msg_rx_ring.phys);
                goto out;
        }