[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <1406710457-6195-1-git-send-email-xjq@rock-chips.com>
Date: Wed, 30 Jul 2014 16:54:17 +0800
From: jianqun <xjq@...k-chips.com>
To: broonie@...nel.org, lgirdwood@...il.com, perex@...ex.cz,
tiwai@...e.de, tbleung@...omium.org, dgreid@...omium.org,
kevin.strasser@...el.com, jarkko.nikula@...ux.intel.com,
swarren@...dia.com, ralph.birt@...imintegrated.com
Cc: heiko@...ech.de, alsa-devel@...a-project.org,
linux-kernel@...r.kernel.org, Jianqun <xjq@...k-chips.com>
Subject: [PATCH] ASoC: max98090 add irq valid check
From: Jianqun <xjq@...k-chips.com>
Since IRQ pin from max98090 may NC, the irq number will be zero, that is
invalid for request_threaded_irq, so just add irq valid check there.
Since hardware may not MUST to use IRQ pin of max98090 as jack detect, the
driver can work well without it, can report jack trigger to CPU by a GPIO.
But here driver will register fail caused by failed to request irq.
Signed-off-by: Jianqun <xjq@...k-chips.com>
---
sound/soc/codecs/max98090.c | 14 ++++++++------
1 file changed, 8 insertions(+), 6 deletions(-)
diff --git a/sound/soc/codecs/max98090.c b/sound/soc/codecs/max98090.c
index 566919c..9dc0e8c 100644
--- a/sound/soc/codecs/max98090.c
+++ b/sound/soc/codecs/max98090.c
@@ -2478,12 +2478,14 @@ static int max98090_probe(struct snd_soc_codec *codec)
/* Register for interrupts */
dev_dbg(codec->dev, "irq = %d\n", max98090->irq);
- ret = request_threaded_irq(max98090->irq, NULL,
- max98090_interrupt, IRQF_TRIGGER_FALLING | IRQF_ONESHOT,
- "max98090_interrupt", codec);
- if (ret < 0) {
- dev_err(codec->dev, "request_irq failed: %d\n",
- ret);
+ if (max98090->irq) {
+ ret = request_threaded_irq(max98090->irq, NULL,
+ max98090_interrupt, IRQF_TRIGGER_FALLING | IRQF_ONESHOT,
+ "max98090_interrupt", codec);
+ if (ret < 0) {
+ dev_err(codec->dev, "request_irq failed: %d\n",
+ ret);
+ }
}
/*
--
1.7.9.5
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists