Skip to content

Commit e7aa105

Browse files
soyersoyertiwai
authored andcommitted
ALSA: hda/tas2781: move set_drv_data outside tasdevice_init
allow driver specific driver data in tas2781-hda-i2c and tas2781-i2c Fixes: ef3bcde ("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>
1 parent a0c9f7f commit e7aa105

File tree

3 files changed

+4
-2
lines changed

3 files changed

+4
-2
lines changed

sound/pci/hda/tas2781_hda_i2c.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -659,6 +659,8 @@ static int tas2781_hda_i2c_probe(struct i2c_client *clt)
659659
if (!tas_priv)
660660
return -ENOMEM;
661661

662+
dev_set_drvdata(&clt->dev, tas_priv);
663+
662664
tas_priv->irq_info.irq = clt->irq;
663665
ret = tas2781_read_acpi(tas_priv, device_name);
664666
if (ret)

sound/soc/codecs/tas2781-comlib.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -316,8 +316,6 @@ int tasdevice_init(struct tasdevice_priv *tas_priv)
316316
tas_priv->tasdevice[i].cur_conf = -1;
317317
}
318318

319-
dev_set_drvdata(tas_priv->dev, tas_priv);
320-
321319
mutex_init(&tas_priv->codec_lock);
322320

323321
out:

sound/soc/codecs/tas2781-i2c.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -689,6 +689,8 @@ static int tasdevice_i2c_probe(struct i2c_client *i2c)
689689
if (!tas_priv)
690690
return -ENOMEM;
691691

692+
dev_set_drvdata(&i2c->dev, tas_priv);
693+
692694
if (ACPI_HANDLE(&i2c->dev)) {
693695
acpi_id = acpi_match_device(i2c->dev.driver->acpi_match_table,
694696
&i2c->dev);

0 commit comments

Comments
 (0)