Unverified Commit 05a76e81 authored by Mark Brown's avatar Mark Brown
Browse files

Merge branch 'topic/hdac-hdmi' of... 

Merge branch 'topic/hdac-hdmi' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-intel
parents 2be2d579 1e02dac3

include/sound/hdaudio_ext.h

+2 −2
Original line number Diff line number Diff line
@@ -193,7 +193,7 @@ struct hda_dai_map { 
 * @pvt_data - private data, for asoc contains asoc codec object

 */

struct hdac_ext_device {

	struct hdac_device hdac;

	struct hdac_device hdev;

	struct hdac_ext_bus *ebus;



	/* soc-dai to nid map */
@@ -213,7 +213,7 @@ struct hdac_ext_dma_params { 
	u8 stream_tag;

};

#define to_ehdac_device(dev) (container_of((dev), \

				 struct hdac_ext_device, hdac))

				 struct hdac_ext_device, hdev))

/*

 * HD-audio codec base driver

 */

sound/hda/ext/hdac_ext_bus.c

+1 −1
Original line number Diff line number Diff line
@@ -146,7 +146,7 @@ int snd_hdac_ext_bus_device_init(struct hdac_ext_bus *ebus, int addr) 
	edev = kzalloc(sizeof(*edev), GFP_KERNEL);

	if (!edev)

		return -ENOMEM;

	hdev = &edev->hdac;

	hdev = &edev->hdev;

	edev->ebus = ebus;



	snprintf(name, sizeof(name), "ehdaudio%dD%d", ebus->idx, addr);

sound/soc/codecs/hdac_hdmi.c

+175 −181

File changed.

Preview size limit exceeded, changes collapsed.