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

Commit 48a46752 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull sound fixes from Takashi Iwai:
 "A collection of small fixes for 3.4-rc1, including
   - mic-recording regression fix for Realtek codec
   - clean-up of dmaengine parameter mess
   - WM8894 calibration tweak
   - minor fixes for asihpi and some bool module parms"

* tag 'sound-3.4' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound:
  ALSA: fix isa/opti9xx module param type
  sound: fix oss/msnd_pinnacle module param type
  ALSA: asihpi - fix return type of hpios_locked_mem_alloc()
  ASoC: dmaengine_pcm: use dmaengine cyclic wrapper
  ASoC: Add extra parameter to device_prep_dma_cyclic
  ALSA: hda/realtek - Fix ADC assignment with a shared HP/Mic pin
  ASoC: wm8994: Update WM8994 DCS calibration
parents 59f2fe32 c578ae00

sound/isa/opti9xx/opti92x-ad1848.c

+1 −1
Original line number Diff line number Diff line
@@ -65,7 +65,7 @@ static int index = SNDRV_DEFAULT_IDX1; /* Index 0-MAX */ 
static char *id = SNDRV_DEFAULT_STR1;		/* ID for this card */

//static bool enable = SNDRV_DEFAULT_ENABLE1;	/* Enable this card */

#ifdef CONFIG_PNP

static int isapnp = 1;			/* Enable ISA PnP detection */

static bool isapnp = true;			/* Enable ISA PnP detection */

#endif

static long port = SNDRV_DEFAULT_PORT1; 	/* 0x530,0xe80,0xf40,0x604 */

static long mpu_port = SNDRV_DEFAULT_PORT1;	/* 0x300,0x310,0x320,0x330 */

sound/oss/msnd_pinnacle.c

+1 −1
Original line number Diff line number Diff line
@@ -1631,7 +1631,7 @@ static int ide_irq __initdata = 0; 
static int joystick_io __initdata = 0;



/* If we have the digital daugherboard... */

static int digital __initdata = 0;

static bool digital __initdata = false;

#endif



static int fifosize __initdata =	DEFFIFOSIZE;

sound/pci/asihpi/hpi_internal.h

+1 −1
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@ On error *pLockedMemHandle marked invalid, non-zero returned. 
If this function succeeds, then HpiOs_LockedMem_GetVirtAddr() and

HpiOs_LockedMem_GetPyhsAddr() will always succed on the returned handle.

*/

u16 hpios_locked_mem_alloc(struct consistent_dma_area *p_locked_mem_handle,

int hpios_locked_mem_alloc(struct consistent_dma_area *p_locked_mem_handle,

							   /**< memory handle */

	u32 size, /**< Size in bytes to allocate */

	struct pci_dev *p_os_reference

sound/pci/asihpi/hpios.c

+1 −1
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ void hpios_delay_micro_seconds(u32 num_micro_sec) 


On error, return -ENOMEM, and *pMemArea.size = 0

*/

u16 hpios_locked_mem_alloc(struct consistent_dma_area *p_mem_area, u32 size,

int hpios_locked_mem_alloc(struct consistent_dma_area *p_mem_area, u32 size,

	struct pci_dev *pdev)

{

	/*?? any benefit in using managed dmam_alloc_coherent? */

sound/pci/hda/patch_realtek.c

+7 −4
Original line number Diff line number Diff line
@@ -2717,9 +2717,6 @@ static int alc_auto_fill_adc_caps(struct hda_codec *codec) 
	int max_nums = ARRAY_SIZE(spec->private_adc_nids);

	int i, nums = 0;



	if (spec->shared_mic_hp)

		max_nums = 1; /* no multi streams with the shared HP/mic */



	nid = codec->start_nid;

	for (i = 0; i < codec->num_nodes; i++, nid++) {

		hda_nid_t src;
@@ -4076,6 +4073,7 @@ static void alc_remove_invalid_adc_nids(struct hda_codec *codec) 
	if (spec->dyn_adc_switch)

		return;



 again:

	nums = 0;

	for (n = 0; n < spec->num_adc_nids; n++) {

		hda_nid_t cap = spec->private_capsrc_nids[n];
@@ -4096,6 +4094,11 @@ static void alc_remove_invalid_adc_nids(struct hda_codec *codec) 
	if (!nums) {

		/* check whether ADC-switch is possible */

		if (!alc_check_dyn_adc_switch(codec)) {

			if (spec->shared_mic_hp) {

				spec->shared_mic_hp = 0;

				spec->private_imux[0].num_items = 1;

				goto again;

			}

			printk(KERN_WARNING "hda_codec: %s: no valid ADC found;"

			       " using fallback 0x%x\n",

			       codec->chip_name, spec->private_adc_nids[0]);
@@ -4113,7 +4116,7 @@ static void alc_remove_invalid_adc_nids(struct hda_codec *codec) 


	if (spec->auto_mic)

		alc_auto_mic_check_imux(codec); /* check auto-mic setups */

	else if (spec->input_mux->num_items == 1)

	else if (spec->input_mux->num_items == 1 || spec->shared_mic_hp)

		spec->num_adc_nids = 1; /* reduce to a single ADC */

}