Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8f09aacf authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'sound-3.9' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound 

Pull sound fixes from Takashi Iwai:
 "This contains slightly more volumes than usual at this stage, mostly
  because of my vacation in the last week.  Nothing to scare, all small
  and/or trivial fixes:

   - Fix loop path handling in ASoC DAPM
   - Some memory handling fixes in ASoC core
   - Fix spear_pcm to adapt to the updated API
   - HD-audio HDMI ELD handling fixes
   - Fix for CM6331 USB-audio SRC change bugs
   - Revert power_save_controller option change due to user-space usage
   - A few other small ASoC and HD-audio fixes"

* tag 'sound-3.9' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound:
  ALSA: hda/generic - fix uninitialized variable
  Revert "ALSA: hda - Allow power_save_controller option override DCAPS"
  ALSA: hda - fix typo in proc output
  ALSA: hda - Enabling Realtek ALC 671 codec
  ALSA: usb: Work around CM6631 sample rate change bug
  ALSA: hda - bug fix on HDMI ELD debug message
  ALSA: hda - bug fix on return value when getting HDMI ELD info
  ASoC: dma-sh7760: Fix compile error
  ASoC: core: fix invalid free of devm_ allocated data
  ASoC: spear_pcm: Update to new pcm_new() API
  ASoC:: max98090: Remove executable bit
  ASoC: dapm: Fix pointer dereference in is_connected_output_ep()
  ASoC: pcm030 audio fabric: remove __init from probe
  ASoC: imx-ssi: Fix occasional AC97 reset failure
  ASoC: core: fix possible memory leak in snd_soc_bytes_put()
  ASoC: wm_adsp: fix possible memory leak in wm_adsp_load_coeff()
  ASoC: dapm: Fix handling of loops
  ASoC: si476x: Add missing break for SNDRV_PCM_FORMAT_S8 switch case
parents d08d528d 868211db

Documentation/sound/alsa/ALSA-Configuration.txt

+2 −3
Original line number Diff line number Diff line
@@ -890,9 +890,8 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed. 
    enable_msi	- Enable Message Signaled Interrupt (MSI) (default = off)

    power_save	- Automatic power-saving timeout (in second, 0 =

		disable)

    power_save_controller - Support runtime D3 of HD-audio controller

		(-1 = on for supported chip (default), false = off,

		 true = force to on even for unsupported hardware)

    power_save_controller - Reset HD-audio controller in power-saving mode

		(default = on)

    align_buffer_size - Force rounding of buffer/period sizes to multiples

    		      of 128 bytes. This is more efficient in terms of memory

		      access but isn't required by the HDA spec and prevents

include/sound/max98090.h

100755 → 100644
+0 −0

File mode changed from 100755 to 100644.

View file

include/sound/soc-dapm.h

+1 −0
Original line number Diff line number Diff line
@@ -488,6 +488,7 @@ struct snd_soc_dapm_path { 
	/* status */

	u32 connect:1;	/* source and sink widgets are connected */

	u32 walked:1;	/* path has been walked */

	u32 walking:1;  /* path is in the process of being walked */

	u32 weak:1;	/* path ignored for power management */



	int (*connected)(struct snd_soc_dapm_widget *source,

sound/pci/hda/hda_codec.c

+1 −1
Original line number Diff line number Diff line
@@ -173,7 +173,7 @@ const char *snd_hda_get_jack_type(u32 cfg) 
		"Line Out", "Speaker", "HP Out", "CD",

		"SPDIF Out", "Digital Out", "Modem Line", "Modem Hand",

		"Line In", "Aux", "Mic", "Telephony",

		"SPDIF In", "Digitial In", "Reserved", "Other"

		"SPDIF In", "Digital In", "Reserved", "Other"

	};



	return jack_types[(cfg & AC_DEFCFG_DEVICE)

sound/pci/hda/hda_eld.c

+1 −1
Original line number Diff line number Diff line
@@ -320,7 +320,7 @@ int snd_hdmi_get_eld(struct hda_codec *codec, hda_nid_t nid, 
		     unsigned char *buf, int *eld_size)

{

	int i;

	int ret;

	int ret = 0;

	int size;



	/*