diff options
| author | Mark Brown | 2020-10-09 15:42:31 +0100 |
|---|---|---|
| committer | Mark Brown | 2020-10-09 15:42:31 +0100 |
| commit | c890e30b069a2792a5a34e8510a7a437dd6f5b3d (patch) | |
| tree | f7fc7cb5e6fddbe4cae599b41bb39ebc349b94cd /sound/hda | |
| parent | 7ffe09eebf732f9c95623613fb706dada858c07d (diff) | |
| parent | 86f29c7442ac4ba5fe19fc2ada457f76c0080dd6 (diff) | |
Merge remote-tracking branch 'asoc/for-5.10' into asoc-next
Diffstat (limited to 'sound/hda')
| -rw-r--r-- | sound/hda/ext/hdac_ext_bus.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sound/hda/ext/hdac_ext_bus.c b/sound/hda/ext/hdac_ext_bus.c index d0a604c939df..765c40a6ccba 100644 --- a/sound/hda/ext/hdac_ext_bus.c +++ b/sound/hda/ext/hdac_ext_bus.c @@ -70,11 +70,12 @@ static void default_release(struct device *dev) * @bus: hdac bus to attach to * @addr: codec address * @hdev: hdac device to init + * @type: codec type (HDAC_DEV_*) to use for this device * * Returns zero for success or a negative error code. */ int snd_hdac_ext_bus_device_init(struct hdac_bus *bus, int addr, - struct hdac_device *hdev) + struct hdac_device *hdev, int type) { char name[15]; int ret; @@ -88,7 +89,7 @@ int snd_hdac_ext_bus_device_init(struct hdac_bus *bus, int addr, dev_err(bus->dev, "device init failed for hdac device\n"); return ret; } - hdev->type = HDA_DEV_ASOC; + hdev->type = type; hdev->dev.release = default_release; ret = snd_hdac_device_register(hdev); |