summaryrefslogtreecommitdiff
path: root/sound/pci/hda/hda_codec.c
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2015-04-14 17:26:00 +0200
committerTakashi Iwai <tiwai@suse.de>2015-04-16 07:31:48 +0200
commita43ff5baa55ff87268a67b45c6f6cb261c023db1 (patch)
tree74841b3cd338bfd81110df6931672a4e22747a0e /sound/pci/hda/hda_codec.c
parent7e8be1b309be28e4c92818fed1c55bdac919c7dd (diff)
ALSA: hda - Pass bus io_ops directly from the top-level driver
One less redirection again. This also requires the change of the call order in the toplevel divers. Namely, the bus has to be created at first before other initializations since the memory allocation ops are called through bus object now. Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci/hda/hda_codec.c')
-rw-r--r--sound/pci/hda/hda_codec.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/sound/pci/hda/hda_codec.c b/sound/pci/hda/hda_codec.c
index 7e3dcaba6365..ddebe7541390 100644
--- a/sound/pci/hda/hda_codec.c
+++ b/sound/pci/hda/hda_codec.c
@@ -516,6 +516,7 @@ static int snd_hda_bus_dev_disconnect(struct snd_device *device)
*/
int snd_hda_bus_new(struct snd_card *card,
const struct hdac_bus_ops *ops,
+ const struct hdac_io_ops *io_ops,
struct hda_bus **busp)
{
struct hda_bus *bus;
@@ -532,7 +533,7 @@ int snd_hda_bus_new(struct snd_card *card,
if (!bus)
return -ENOMEM;
- err = snd_hdac_bus_init(&bus->core, card->dev, ops, NULL);
+ err = snd_hdac_bus_init(&bus->core, card->dev, ops, io_ops);
if (err < 0) {
kfree(bus);
return err;