Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

ALSA: hda/tas2781: move set_drv_data outside tasdevice_init

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

Fixes: ef3bcde75d06 ("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>

authored by

Gergo Koteles and committed by
Takashi Iwai
e7aa1056 a0c9f7f2

+4 -2
+2
sound/pci/hda/tas2781_hda_i2c.c
··· 659 659 if (!tas_priv) 660 660 return -ENOMEM; 661 661 662 + dev_set_drvdata(&clt->dev, tas_priv); 663 + 662 664 tas_priv->irq_info.irq = clt->irq; 663 665 ret = tas2781_read_acpi(tas_priv, device_name); 664 666 if (ret)
-2
sound/soc/codecs/tas2781-comlib.c
··· 316 316 tas_priv->tasdevice[i].cur_conf = -1; 317 317 } 318 318 319 - dev_set_drvdata(tas_priv->dev, tas_priv); 320 - 321 319 mutex_init(&tas_priv->codec_lock); 322 320 323 321 out:
+2
sound/soc/codecs/tas2781-i2c.c
··· 689 689 if (!tas_priv) 690 690 return -ENOMEM; 691 691 692 + dev_set_drvdata(&i2c->dev, tas_priv); 693 + 692 694 if (ACPI_HANDLE(&i2c->dev)) { 693 695 acpi_id = acpi_match_device(i2c->dev.driver->acpi_match_table, 694 696 &i2c->dev);