• Hans de Goede's avatar
    ASoC: rt5640: Revert "Fix sleep in atomic context" · fa6a0c0c
    Hans de Goede authored
    Commit 70a6404f ("ASoC: rt5640: Fix sleep in atomic context")
    not only switched from request_irq() to request_threaded_irq(),
    to fix the sleep in atomic context issue, but it also added
    devm management of the IRQ by actually switching to
    devm_request_threaded_irq() (without any explanation in the commit
    message for this change).
    
    This is wrong since the IRQ was already explicitly managed by
    the driver. On unbind the ASoC core will call rt5640_set_jack(NULL)
    which in turn will call rt5640_disable_jack_detect() which
    frees the IRQ already. So now we have a double free.
    
    Besides the unexplained switch to devm being wrong, the actual fix
    for the sleep in atomic context issue also is not the best solution.
    
    The only thing which rt5640_irq() does is cancel + (re-)queue
    the jack_work delayed_work. This can be done in a single non sleeping
    call by replacing queue_delayed_work() with mod_delayed_work(),
    which does not sleep. Using mod_delayed_work() is a much better fix
    then adding a thread which does nothing other then queuing a work-item.
    
    This patch is a straight revert of the troublesome changes, the switch
    to mod_delayed_work() is done in a separate follow-up patch.
    
    Fixes: 70a6404f ("ASoC: rt5640: Fix sleep in atomic context")
    Cc: Sameer Pujar <spujar@nvidia.com>
    Cc: Oder Chiou <oder_chiou@realtek.com>
    Signed-off-by: default avatarHans de Goede <hdegoede@redhat.com>
    Link: https://lore.kernel.org/r/20230912113245.320159-2-hdegoede@redhat.comSigned-off-by: default avatarMark Brown <broonie@kernel.org>
    fa6a0c0c
rt5640.c 93.6 KB