lkml.org 
[lkml]   [2021]   [Aug]   [21]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH] powerpc/512x: Fix an error handling path in 'mpc512x_lpbfifo_kick()'
    Date
    At this point 'dma_map_single()' has not been called yet, so there is no
    point in branching in the error handling path to undo it.

    Use a direct return instead.

    Fixes: 1a4bb93f7955 ("powerpc/512x: add LocalPlus Bus FIFO device driver")
    Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
    ---
    This patch is speculative. Review with care.
    ---
    arch/powerpc/platforms/512x/mpc512x_lpbfifo.c | 6 ++----
    1 file changed, 2 insertions(+), 4 deletions(-)

    diff --git a/arch/powerpc/platforms/512x/mpc512x_lpbfifo.c b/arch/powerpc/platforms/512x/mpc512x_lpbfifo.c
    index 04bf6ecf7d55..85e0fa7d902b 100644
    --- a/arch/powerpc/platforms/512x/mpc512x_lpbfifo.c
    +++ b/arch/powerpc/platforms/512x/mpc512x_lpbfifo.c
    @@ -240,10 +240,8 @@ static int mpc512x_lpbfifo_kick(void)
    dma_conf.src_addr_width = DMA_SLAVE_BUSWIDTH_4_BYTES;

    /* Make DMA channel work with LPB FIFO data register */
    - if (dma_dev->device_config(lpbfifo.chan, &dma_conf)) {
    - ret = -EINVAL;
    - goto err_dma_prep;
    - }
    + if (dma_dev->device_config(lpbfifo.chan, &dma_conf))
    + return -EINVAL;

    sg_init_table(&sg, 1);

    --
    2.30.2
    \
     
     \ /
      Last update: 2021-08-21 16:58    [W:12.349 / U:0.024 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site