diff options
| author | Takashi Iwai <tiwai@suse.de> | 2019-08-15 21:42:51 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2019-08-15 21:43:05 +0200 |
| commit | 246bb4aaa4f4314816ae6835f3c6cc6dc7a10f4f (patch) | |
| tree | 7836e9fc30f5cae3ed257f3e8aaaf605bd974632 /sound/hda | |
| parent | ddf7cb83b0f45feb94ad89a987f600c766c463ca (diff) | |
| download | linux-246bb4aaa4f4314816ae6835f3c6cc6dc7a10f4f.tar.bz2 | |
Revert "ALSA: hda: Add codec on bus address table lately"
This reverts commit ee5f85d9290f ("ALSA: hda: Add codec on bus address
table lately"). The commit caused several regression since I've
overlooked that the function doesn't manage only the caddr_tbl but
also the codec linked list that is referred indirectly in the other
drivers.
Revert for now to make everything back to work.
Fixes: ee5f85d9290f ("ALSA: hda: Add codec on bus address table lately")
Reported-by: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/hda')
| -rw-r--r-- | sound/hda/hdac_device.c | 21 |
1 files changed, 9 insertions, 12 deletions
diff --git a/sound/hda/hdac_device.c b/sound/hda/hdac_device.c index bf83d7062ef6..9f3e37511408 100644 --- a/sound/hda/hdac_device.c +++ b/sound/hda/hdac_device.c @@ -61,6 +61,10 @@ int snd_hdac_device_init(struct hdac_device *codec, struct hdac_bus *bus, pm_runtime_get_noresume(&codec->dev); atomic_set(&codec->in_pm, 0); + err = snd_hdac_bus_add_device(bus, codec); + if (err < 0) + goto error; + /* fill parameters */ codec->vendor_id = snd_hdac_read_parm(codec, AC_NODE_ROOT, AC_PAR_VENDOR_ID); @@ -139,22 +143,15 @@ int snd_hdac_device_register(struct hdac_device *codec) err = device_add(&codec->dev); if (err < 0) return err; - err = snd_hdac_bus_add_device(codec->bus, codec); - if (err < 0) - goto error; mutex_lock(&codec->widget_lock); err = hda_widget_sysfs_init(codec); mutex_unlock(&codec->widget_lock); - if (err < 0) - goto error_remove; + if (err < 0) { + device_del(&codec->dev); + return err; + } return 0; - - error_remove: - snd_hdac_bus_remove_device(codec->bus, codec); - error: - device_del(&codec->dev); - return err; } EXPORT_SYMBOL_GPL(snd_hdac_device_register); @@ -168,8 +165,8 @@ void snd_hdac_device_unregister(struct hdac_device *codec) mutex_lock(&codec->widget_lock); hda_widget_sysfs_exit(codec); mutex_unlock(&codec->widget_lock); - snd_hdac_bus_remove_device(codec->bus, codec); device_del(&codec->dev); + snd_hdac_bus_remove_device(codec->bus, codec); } } EXPORT_SYMBOL_GPL(snd_hdac_device_unregister); |