• Hans de Goede's avatar
    ASoC: rt5640: Do not disable/enable IRQ twice on suspend/resume · 786120eb
    Hans de Goede authored
    When jack-detect was originally added disabling the IRQ during suspend
    was done by the sound/soc/intel/boards/bytcr_rt5640.c driver
    calling snd_soc_component_set_jack(NULL) on suspend, which calls
    rt5640_disable_jack_detect(), which calls free_irq() which also
    disables it.
    
    Commit 5fabcc90 ("ASoC: rt5640: Fix Jack work after system suspend")
    added disable_irq() / enable_irq() calls on suspend/resume for machine
    drivers which do not call snd_soc_component_set_jack(NULL) on suspend.
    
    The new disable_irq() / enable_irq() are made conditional by
    "if (rt5640->irq)" statements, but this is true for the machine drivers
    which do call snd_soc_component_set_jack(NULL) on suspend too, causing
    a disable_irq() call there on the already free-ed IRQ.
    
    Change the "if (rt5640->irq)" condition to "if (rt5640->jack)" to fix this,
    rt5640->jack is only set if the jack-detect IRQ handler is still active
    when rt5640_suspend() runs.
    
    And adjust rt5640_enable_hda_jack_detect()'s request_irq() error handling
    to set rt5640->jack to NULL to match (note that the old setting of irq to
    -ENOXIO still resulted in disable_irq(-ENOXIO) calls on suspend).
    
    Fixes: 5fabcc90 ("ASoC: rt5640: Fix Jack work after system suspend")
    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-4-hdegoede@redhat.comSigned-off-by: default avatarMark Brown <broonie@kernel.org>
    786120eb
rt5640.c 93.5 KB