Commit 5c0f9652 authored by Stephan Gerhold's avatar Stephan Gerhold Committed by Mark Brown

ASoC: codecs: msm8916-wcd-analog: Properly handle probe errors

The probe() function fails with an error for platform_get_irq_byname()
but only logs when devm_request_threaded_irq() fails. Make this
consistent and fail to probe in that case as well. In practice this
should never happen unless something is really wrong.
Signed-off-by: default avatarStephan Gerhold <stephan@gerhold.net>
Link: https://lore.kernel.org/r/20230718-pm8916-mclk-v1-5-4b4a58b4240a@gerhold.netSigned-off-by: default avatarMark Brown <broonie@kernel.org>
parent 97f29c1a
...@@ -1216,8 +1216,10 @@ static int pm8916_wcd_analog_spmi_probe(struct platform_device *pdev) ...@@ -1216,8 +1216,10 @@ static int pm8916_wcd_analog_spmi_probe(struct platform_device *pdev)
IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING | IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING |
IRQF_ONESHOT, IRQF_ONESHOT,
"mbhc switch irq", priv); "mbhc switch irq", priv);
if (ret) if (ret) {
dev_err(dev, "cannot request mbhc switch irq\n"); dev_err(dev, "cannot request mbhc switch irq\n");
return ret;
}
if (priv->mbhc_btn_enabled) { if (priv->mbhc_btn_enabled) {
irq = platform_get_irq_byname(pdev, "mbhc_but_press_det"); irq = platform_get_irq_byname(pdev, "mbhc_but_press_det");
...@@ -1229,8 +1231,10 @@ static int pm8916_wcd_analog_spmi_probe(struct platform_device *pdev) ...@@ -1229,8 +1231,10 @@ static int pm8916_wcd_analog_spmi_probe(struct platform_device *pdev)
IRQF_TRIGGER_RISING | IRQF_TRIGGER_RISING |
IRQF_TRIGGER_FALLING | IRQF_ONESHOT, IRQF_TRIGGER_FALLING | IRQF_ONESHOT,
"mbhc btn press irq", priv); "mbhc btn press irq", priv);
if (ret) if (ret) {
dev_err(dev, "cannot request mbhc button press irq\n"); dev_err(dev, "cannot request mbhc button press irq\n");
return ret;
}
irq = platform_get_irq_byname(pdev, "mbhc_but_rel_det"); irq = platform_get_irq_byname(pdev, "mbhc_but_rel_det");
if (irq < 0) if (irq < 0)
...@@ -1241,9 +1245,10 @@ static int pm8916_wcd_analog_spmi_probe(struct platform_device *pdev) ...@@ -1241,9 +1245,10 @@ static int pm8916_wcd_analog_spmi_probe(struct platform_device *pdev)
IRQF_TRIGGER_RISING | IRQF_TRIGGER_RISING |
IRQF_TRIGGER_FALLING | IRQF_ONESHOT, IRQF_TRIGGER_FALLING | IRQF_ONESHOT,
"mbhc btn release irq", priv); "mbhc btn release irq", priv);
if (ret) if (ret) {
dev_err(dev, "cannot request mbhc button release irq\n"); dev_err(dev, "cannot request mbhc button release irq\n");
return ret;
}
} }
dev_set_drvdata(dev, priv); dev_set_drvdata(dev, priv);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment