Skip to content

ASoC: tas2764: Free the fault IRQ when the component is removed #765

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
erikwb wants to merge 1 commit into from
Closed

ASoC: tas2764: Free the fault IRQ when the component is removed #765

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 23 additions & 8 deletions sound/soc/codecs/tas2764.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,8 @@ struct tas2764_priv {
struct regmap *regmap;
struct device *dev;
int irq;
/* Set while the component holds the fault IRQ */
bool irq_requested;
enum tas2764_devid devid;

int v_sense_slot;
Expand Down Expand Up @@ -954,14 +956,6 @@ static int tas2764_codec_probe(struct snd_soc_component *component)
ret = snd_soc_component_write(tas2764->component, TAS2764_INT_MASK4, 0xff);
if (ret < 0)
return ret;

ret = devm_request_threaded_irq(tas2764->dev, tas2764->irq, NULL, tas2764_irq,
IRQF_ONESHOT | IRQF_SHARED | IRQF_TRIGGER_LOW,
"tas2764", tas2764);
if (ret && tas2764->sdz_group)
return dev_err_probe(tas2764->dev, ret, "SDZ group needs its fault IRQ\n");
if (ret)
dev_warn(tas2764->dev, "failed to request IRQ: %d\n", ret);
}

if (tas2764->i_sense_slot != -1 && tas2764->v_sense_slot != -1) {
Expand Down Expand Up @@ -1000,13 +994,34 @@ static int tas2764_codec_probe(struct snd_soc_component *component)
break;
}

/*
* Last, so that no failure leaves the handler behind: the IRQ belongs to the I2C
* device, which outlives the component, and the remove frees it.
*/
if (tas2764->irq) {
ret = devm_request_threaded_irq(tas2764->dev, tas2764->irq, NULL, tas2764_irq,
IRQF_ONESHOT | IRQF_SHARED | IRQF_TRIGGER_LOW,
"tas2764", tas2764);
if (ret && tas2764->sdz_group)
return dev_err_probe(tas2764->dev, ret, "SDZ group needs its fault IRQ\n");
if (ret)
dev_warn(tas2764->dev, "failed to request IRQ: %d\n", ret);
else
tas2764->irq_requested = true;
}

return 0;
}

static void tas2764_codec_remove(struct snd_soc_component *component)
{
struct tas2764_priv *tas2764 = snd_soc_component_get_drvdata(component);

if (tas2764->irq_requested) {
devm_free_irq(tas2764->dev, tas2764->irq, tas2764);
tas2764->irq_requested = false;
}

/* A failed group's supply was forced off: there is no enable left to balance. */
if (tas2764_group_failed(tas2764))
return;
Expand Down