ASoc: qcom: q6afe: fix bad guard conversion

A recent spinlock guard conversion used the wrong guard so that
interrupts are no longer disabled while holding the port list lock.

Based on a cursory look this appears to be safe currently, but it could
cause a deadlock if one of these helpers are ever called in interrupt
context.

Fixes: 4b1edbb028fb ("ASoC: qcom: q6afe: Use guard() for spin locks")
Cc: Srinivas Kandagatla <srinivas.kandagatla@oss.qualcomm.com>
Signed-off-by: Johan Hovold <johan@kernel.org>
Reviewed-by: Srinivas Kandagatla <srinivas.kandagatla@oss.qualcomm.com>
Link: https://patch.msgid.link/20251203105542.24765-2-johan@kernel.org
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/qcom/qdsp6/q6afe.c b/sound/soc/qcom/qdsp6/q6afe.c
index 980851a129760866e19da6c4430f547d3fc1234b..0b01fc9e13a7278ff11567bc4e7f14ae65c60d91 100644 (file)
--- a/sound/soc/qcom/qdsp6/q6afe.c
+++ b/sound/soc/qcom/qdsp6/q6afe.c
@@ -947,7 +947,7 @@ static struct q6afe_port *q6afe_find_port(struct q6afe *afe, int token)
        struct q6afe_port *p;
        struct q6afe_port *ret = NULL;
 
-       guard(spinlock)(&afe->port_list_lock);
+       guard(spinlock_irqsave)(&afe->port_list_lock);
        list_for_each_entry(p, &afe->port_list, node)
                if (p->token == token) {
                        ret = p;
@@ -1807,7 +1807,7 @@ struct q6afe_port *q6afe_port_get_from_id(struct device *dev, int id)
        port->cfg_type = cfg_type;
        kref_init(&port->refcount);
 
-       guard(spinlock)(&afe->port_list_lock);
+       guard(spinlock_irqsave)(&afe->port_list_lock);
        list_add_tail(&port->node, &afe->port_list);
 
        return port;