Commit 246bb4aa authored by Takashi Iwai's avatar Takashi Iwai
Browse files

Revert "ALSA: hda: Add codec on bus address table lately" 



This reverts commit ee5f85d9 ("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: ee5f85d9 ("ALSA: hda: Add codec on bus address table lately")
Reported-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent ddf7cb83

sound/hda/hdac_device.c

+9 −12
Original line number Diff line number Diff line
@@ -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,23 +143,16 @@ 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;



	return 0;



 error_remove:

	snd_hdac_bus_remove_device(codec->bus, codec);

 error:

	if (err < 0) {

		device_del(&codec->dev);

		return err;

	}



	return 0;

}

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);