]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
ASoC: xilinx: formatter_pcm: pass aud_drv_data to irq handlers
authorRosen Penev <rosenp@gmail.com>
Thu, 6 Aug 2026 23:32:31 +0000 (16:32 -0700)
committerMark Brown <broonie@kernel.org>
Tue, 11 Aug 2026 14:41:29 +0000 (15:41 +0100)
The irq handlers take a struct device pointer and call
dev_get_drvdata() to obtain the driver data.  However, the driver
data is only set at the end of probe, after devm_request_irq(),
so an interrupt taken in between causes the handlers to pass a
NULL pointer to readl() and crash.

Pass the private data directly as the devm_request_irq() argument
instead of the device pointer, matching what the handlers expect.

Fixes: 6f6c3c36f091 ("ASoC: xlnx: add pcm formatter platform driver")
Assisted-by: opencode:deepseek-v4-flash-free
Signed-off-by: Rosen Penev <rosenp@gmail.com>
Reviewed-by: Michal Simek <michal.simek@amd.com>
Link: https://patch.msgid.link/20260806233231.30631-1-rosenp@gmail.com
Signed-off-by: Mark Brown <broonie@kernel.org>
sound/soc/xilinx/xlnx_formatter_pcm.c

index 8f7a76758535b82fa36f26f03180099c6445285f..f15336197ed31e463b7f931d72ab666cb6f81b2d 100644 (file)
@@ -281,8 +281,7 @@ static irqreturn_t xlnx_mm2s_irq_handler(int irq, void *arg)
 {
        u32 val;
        void __iomem *reg;
-       struct device *dev = arg;
-       struct xlnx_pcm_drv_data *adata = dev_get_drvdata(dev);
+       struct xlnx_pcm_drv_data *adata = arg;
 
        reg = adata->mmio + XLNX_MM2S_OFFSET + XLNX_AUD_STS;
        val = readl(reg);
@@ -300,8 +299,7 @@ static irqreturn_t xlnx_s2mm_irq_handler(int irq, void *arg)
 {
        u32 val;
        void __iomem *reg;
-       struct device *dev = arg;
-       struct xlnx_pcm_drv_data *adata = dev_get_drvdata(dev);
+       struct xlnx_pcm_drv_data *adata = arg;
 
        reg = adata->mmio + XLNX_S2MM_OFFSET + XLNX_AUD_STS;
        val = readl(reg);
@@ -637,7 +635,7 @@ static int xlnx_formatter_pcm_probe(struct platform_device *pdev)
                }
                ret = devm_request_irq(dev, aud_drv_data->mm2s_irq,
                                       xlnx_mm2s_irq_handler, 0,
-                                      "xlnx_formatter_pcm_mm2s_irq", dev);
+                                      "xlnx_formatter_pcm_mm2s_irq", aud_drv_data);
                if (ret) {
                        dev_err(dev, "xlnx audio mm2s irq request failed\n");
                        goto clk_err;
@@ -664,7 +662,7 @@ static int xlnx_formatter_pcm_probe(struct platform_device *pdev)
                ret = devm_request_irq(dev, aud_drv_data->s2mm_irq,
                                       xlnx_s2mm_irq_handler, 0,
                                       "xlnx_formatter_pcm_s2mm_irq",
-                                      dev);
+                                      aud_drv_data);
                if (ret) {
                        dev_err(dev, "xlnx audio s2mm irq request failed\n");
                        goto clk_err;