lkml.org 
[lkml]   [2021]   [Jul]   [12]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.12 263/700] pata_octeon_cf: avoid WARN_ON() in ata_host_activate()
    Date
    From: Sergey Shtylyov <s.shtylyov@omp.ru>

    [ Upstream commit bfc1f378c8953e68ccdbfe0a8c20748427488b80 ]

    Iff platform_get_irq() fails (or returns IRQ0) and thus the polling mode
    has to be used, ata_host_activate() hits the WARN_ON() due to 'irq_handler'
    parameter being non-NULL if the polling mode is selected. Let's only set
    the pointer to the driver's IRQ handler if platform_get_irq() returns a
    valid IRQ # -- this should avoid the unnecessary WARN_ON()...

    Fixes: 43f01da0f279 ("MIPS/OCTEON/ata: Convert pata_octeon_cf.c to use device tree.")
    Signed-off-by: Sergey Shtylyov <s.shtylyov@omp.ru>
    Link: https://lore.kernel.org/r/3a241167-f84d-1d25-5b9b-be910afbe666@omp.ru
    Signed-off-by: Jens Axboe <axboe@kernel.dk>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/ata/pata_octeon_cf.c | 5 +++--
    1 file changed, 3 insertions(+), 2 deletions(-)

    diff --git a/drivers/ata/pata_octeon_cf.c b/drivers/ata/pata_octeon_cf.c
    index bd87476ab481..b5a3f710d76d 100644
    --- a/drivers/ata/pata_octeon_cf.c
    +++ b/drivers/ata/pata_octeon_cf.c
    @@ -898,10 +898,11 @@ static int octeon_cf_probe(struct platform_device *pdev)
    return -EINVAL;
    }

    - irq_handler = octeon_cf_interrupt;
    i = platform_get_irq(dma_dev, 0);
    - if (i > 0)
    + if (i > 0) {
    irq = i;
    + irq_handler = octeon_cf_interrupt;
    + }
    }
    of_node_put(dma_node);
    }
    --
    2.30.2


    \
     
     \ /
      Last update: 2021-07-12 10:10    [W:3.726 / U:0.692 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site