diff options
| author | Mark Brown <broonie@kernel.org> | 2023-09-26 17:14:44 +0300 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2023-09-26 17:14:44 +0300 |
| commit | af08458988cb5dd4b4ff87cfb9da81c6d2c8ef7a (patch) | |
| tree | 5a71f1c4e3099d7cfe4c6f880e707173b6ec9cda /sound/soc/codecs/cs42l43.c | |
| parent | e952e89b0602aeb856396eac4306098249c43548 (diff) | |
| parent | 2b21207afd06714986a3d22442ed4860ba4f9ced (diff) | |
| download | linux-af08458988cb5dd4b4ff87cfb9da81c6d2c8ef7a.tar.xz | |
ASoC: Merge up fixes
For the benefit of CI.
Diffstat (limited to 'sound/soc/codecs/cs42l43.c')
| -rw-r--r-- | sound/soc/codecs/cs42l43.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/sound/soc/codecs/cs42l43.c b/sound/soc/codecs/cs42l43.c index 4e3bc15f1b25..532183095818 100644 --- a/sound/soc/codecs/cs42l43.c +++ b/sound/soc/codecs/cs42l43.c @@ -2077,7 +2077,8 @@ static const struct cs42l43_irq cs42l43_irqs[] = { static int cs42l43_request_irq(struct cs42l43_codec *priv, struct irq_domain *dom, const char * const name, - unsigned int irq, irq_handler_t handler) + unsigned int irq, irq_handler_t handler, + unsigned long flags) { int ret; @@ -2087,8 +2088,8 @@ static int cs42l43_request_irq(struct cs42l43_codec *priv, dev_dbg(priv->dev, "Request IRQ %d for %s\n", ret, name); - ret = devm_request_threaded_irq(priv->dev, ret, NULL, handler, IRQF_ONESHOT, - name, priv); + ret = devm_request_threaded_irq(priv->dev, ret, NULL, handler, + IRQF_ONESHOT | flags, name, priv); if (ret) return dev_err_probe(priv->dev, ret, "Failed to request IRQ %s\n", name); @@ -2124,11 +2125,11 @@ static int cs42l43_shutter_irq(struct cs42l43_codec *priv, return 0; } - ret = cs42l43_request_irq(priv, dom, close_name, close_irq, handler); + ret = cs42l43_request_irq(priv, dom, close_name, close_irq, handler, IRQF_SHARED); if (ret) return ret; - return cs42l43_request_irq(priv, dom, open_name, open_irq, handler); + return cs42l43_request_irq(priv, dom, open_name, open_irq, handler, IRQF_SHARED); } static int cs42l43_codec_probe(struct platform_device *pdev) @@ -2178,7 +2179,8 @@ static int cs42l43_codec_probe(struct platform_device *pdev) for (i = 0; i < ARRAY_SIZE(cs42l43_irqs); i++) { ret = cs42l43_request_irq(priv, dom, cs42l43_irqs[i].name, - cs42l43_irqs[i].irq, cs42l43_irqs[i].handler); + cs42l43_irqs[i].irq, + cs42l43_irqs[i].handler, 0); if (ret) goto err_pm; } |