kevin/linux
1
Fork 0
Code

ALSA: hda/tas2781: move set_drv_data outside tasdevice_init

Browse Source 
allow driver specific driver data in tas2781-hda-i2c and tas2781-i2c

Fixes: ef3bcde75d ("ASoC: tas2781: Add tas2781 driver")
CC: stable@vger.kernel.org
Signed-off-by: Gergo Koteles <soyer@irl.hu>
Link: https://lore.kernel.org/r/1398bd8bf3e935b1595a99128320e4a1913e210a.1703204848.git.soyer@irl.hu
Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
Gergo Koteles 2023-12-22 01:34:47 +01:00 committed by Takashi Iwai
parent a0c9f7f2e0
commit e7aa105657
3 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sound/pci/hda/tas2781_hda_i2c.c
View File

@ -659,6 +659,8 @@ static int tas2781_hda_i2c_probe(struct i2c_client *clt)
if (!tas_priv) if (!tas_priv)
return -ENOMEM; return -ENOMEM;
dev_set_drvdata(&clt->dev, tas_priv);
tas_priv->irq_info.irq = clt->irq; tas_priv->irq_info.irq = clt->irq;
ret = tas2781_read_acpi(tas_priv, device_name); ret = tas2781_read_acpi(tas_priv, device_name);
if (ret) if (ret)

2
sound/soc/codecs/tas2781-comlib.c
View File

@ -316,8 +316,6 @@ int tasdevice_init(struct tasdevice_priv *tas_priv)
tas_priv->tasdevice[i].cur_conf = -1; tas_priv->tasdevice[i].cur_conf = -1;
} }
dev_set_drvdata(tas_priv->dev, tas_priv);
mutex_init(&tas_priv->codec_lock); mutex_init(&tas_priv->codec_lock);
out: out:

2
sound/soc/codecs/tas2781-i2c.c
View File

@ -689,6 +689,8 @@ static int tasdevice_i2c_probe(struct i2c_client *i2c)
if (!tas_priv) if (!tas_priv)
return -ENOMEM; return -ENOMEM;
dev_set_drvdata(&i2c->dev, tas_priv);
if (ACPI_HANDLE(&i2c->dev)) { if (ACPI_HANDLE(&i2c->dev)) {
acpi_id = acpi_match_device(i2c->dev.driver->acpi_match_table, acpi_id = acpi_match_device(i2c->dev.driver->acpi_match_table,
&i2c->dev); &i2c->dev);