lkml.org 
[lkml]   [2021]   [Mar]   [1]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.10 312/663] power: supply: axp20x_usb_power: Init work before enabling IRQs
    Date
    From: Samuel Holland <samuel@sholland.org>

    [ Upstream commit b5e8642ed95ff6ecc20cc6038fe831affa9d098c ]

    The IRQ handler calls mod_delayed_work() on power->vbus_detect. However,
    that work item is not initialized until after the IRQs are enabled. If
    an IRQ is already pending when the driver is probed, the driver calls
    mod_delayed_work() on an uninitialized work item, which causes an oops.

    Fixes: bcfb7ae3f50b ("power: supply: axp20x_usb_power: Only poll while offline")
    Signed-off-by: Samuel Holland <samuel@sholland.org>
    Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.com>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/power/supply/axp20x_usb_power.c | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    diff --git a/drivers/power/supply/axp20x_usb_power.c b/drivers/power/supply/axp20x_usb_power.c
    index 0eaa86c52874a..25e288388edad 100644
    --- a/drivers/power/supply/axp20x_usb_power.c
    +++ b/drivers/power/supply/axp20x_usb_power.c
    @@ -593,6 +593,7 @@ static int axp20x_usb_power_probe(struct platform_device *pdev)
    power->axp20x_id = axp_data->axp20x_id;
    power->regmap = axp20x->regmap;
    power->num_irqs = axp_data->num_irq_names;
    + INIT_DELAYED_WORK(&power->vbus_detect, axp20x_usb_power_poll_vbus);

    if (power->axp20x_id == AXP202_ID) {
    /* Enable vbus valid checking */
    @@ -645,7 +646,6 @@ static int axp20x_usb_power_probe(struct platform_device *pdev)
    }
    }

    - INIT_DELAYED_WORK(&power->vbus_detect, axp20x_usb_power_poll_vbus);
    if (axp20x_usb_vbus_needs_polling(power))
    queue_delayed_work(system_wq, &power->vbus_detect, 0);

    --
    2.27.0


    \
     
     \ /
      Last update: 2021-03-02 01:40    [W:4.895 / U:0.048 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site