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

Commit 05a88a43 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull sound fixes from Takashi Iwai:
 "This contains small fixes since the previous pull request:

   - A few regression fixes and small updates of HD-audio

   - Yet another fix for Haswell HDMI audio

   - A copule of trivial fixes in ASoC McASP, DPAM and WM8994"

* tag 'sound-3.10' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound:
  Revert "ALSA: hda - Don't set up active streams twice"
  ALSA: Add comment for control TLV API
  ALSA: hda - Apply pin-enablement workaround to all Haswell HDMI codecs
  ALSA: HDA: Fix Oops caused by dereference NULL pointer
  ALSA: mips/sgio2audio: Remove redundant platform_set_drvdata()
  ALSA: mips/hal2: Remove redundant platform_set_drvdata()
  ALSA: hda - Fix 3.9 regression of EAPD init on Conexant codecs
  sound: Fix make allmodconfig on MIPS
  ALSA: hda - Fix system panic when DMA > 40 bits for Nvidia audio controllers
  ALSA: atmel: Remove redundant platform_set_drvdata()
  ASoC: McASP: Fix receive clock polarity in DAIFMT_NB_NF mode.
  ASoC: wm8994: missing break in wm8994_aif3_hw_params()
  ASoC: McASP: Add pins output direction for rx clocks when configured in CBS_CFS format
  ASoC: dapm: use clk_prepare_enable and clk_disable_unprepare
parents daf799cc 6c35ae3c

include/sound/tlv.h

+5 −1
Original line number Diff line number Diff line
@@ -74,7 +74,11 @@ 
#define DECLARE_TLV_DB_LINEAR(name, min_dB, max_dB)	\

	unsigned int name[] = { TLV_DB_LINEAR_ITEM(min_dB, max_dB) }



/* dB range container */

/* dB range container:

 * Items in dB range container must be ordered by their values and by their

 * dB values. This implies that larger values must correspond with larger

 * dB values (which is also required for all other mixer controls).

 */

/* Each item is: <min> <max> <TLV> */

#define TLV_DB_RANGE_ITEM(...) \

	TLV_ITEM(SNDRV_CTL_TLVT_DB_RANGE, __VA_ARGS__)

sound/atmel/abdac.c

+0 −2
Original line number Diff line number Diff line
@@ -583,8 +583,6 @@ static int atmel_abdac_remove(struct platform_device *pdev) 
	free_irq(dac->irq, dac);

	snd_card_free(card);



	platform_set_drvdata(pdev, NULL);



	return 0;

}

sound/atmel/ac97c.c

+0 −2
Original line number Diff line number Diff line
@@ -1199,8 +1199,6 @@ static int atmel_ac97c_remove(struct platform_device *pdev) 
	snd_card_set_dev(card, NULL);

	snd_card_free(card);



	platform_set_drvdata(pdev, NULL);



	return 0;

}

sound/mips/hal2.c

+0 −1
Original line number Diff line number Diff line
@@ -922,7 +922,6 @@ static int hal2_remove(struct platform_device *pdev) 
	struct snd_card *card = platform_get_drvdata(pdev);



	snd_card_free(card);

	platform_set_drvdata(pdev, NULL);

	return 0;

}

sound/mips/sgio2audio.c

+0 −1
Original line number Diff line number Diff line
@@ -963,7 +963,6 @@ static int snd_sgio2audio_remove(struct platform_device *pdev) 
	struct snd_card *card = platform_get_drvdata(pdev);



	snd_card_free(card);

	platform_set_drvdata(pdev, NULL);

	return 0;

}