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

Commit bbc54a00 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull sound fixes from Takashi Iwai:
 "This is a round of HD-audio fixes: there are a long-standing
  regression fix and a few more device/codec-specific quirks.

  In addition, a couple of FireWire regression fixes, a USB-audio quirk
  for Roland UA-22 and a sanity check in API for user-defined control
  elements"

* tag 'sound-4.0-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound:
  ALSA: hda - Don't access stereo amps for mono channel widgets
  ALSA: hda - Add workaround for MacBook Air 5,2 built-in mic
  ALSA: hda - Set single_adc_amp flag for CS420x codecs
  ALSA: snd-usb: add quirks for Roland UA-22
  ALSA: control: Add sanity checks for user ctl id name string
  ALSA: hda - Fix built-in mic on Compaq Presario CQ60
  ALSA: firewire-lib: leave unit reference counting completely
  Revert "ALSA: dice: fix wrong offsets for Dice interface"
  ALSA: hda - Fix regression of HD-audio controller fallback modes
parents 3d52c5bd ef403edb

sound/core/control.c

+4 −0
Original line number Diff line number Diff line
@@ -1170,6 +1170,10 @@ static int snd_ctl_elem_add(struct snd_ctl_file *file, 


	if (info->count < 1)

		return -EINVAL;

	if (!*info->id.name)

		return -EINVAL;

	if (strnlen(info->id.name, sizeof(info->id.name)) >= sizeof(info->id.name))

		return -EINVAL;

	access = info->access == 0 ? SNDRV_CTL_ELEM_ACCESS_READWRITE :

		(info->access & (SNDRV_CTL_ELEM_ACCESS_READWRITE|

				 SNDRV_CTL_ELEM_ACCESS_INACTIVE|

sound/firewire/dice/dice-interface.h

+9 −9
Original line number Diff line number Diff line
@@ -298,24 +298,24 @@ 
 */

#define RX_ISOCHRONOUS			0x008



/*

 * Index of first quadlet to be interpreted; read/write.  If > 0, that many

 * quadlets at the beginning of each data block will be ignored, and all the

 * audio and MIDI quadlets will follow.

 */

#define RX_SEQ_START			0x00c



/*

 * The number of audio channels; read-only.  There will be one quadlet per

 * channel.

 */

#define RX_NUMBER_AUDIO			0x00c

#define RX_NUMBER_AUDIO			0x010



/*

 * The number of MIDI ports, 0-8; read-only.  If > 0, there will be one

 * additional quadlet in each data block, following the audio quadlets.

 */

#define RX_NUMBER_MIDI			0x010



/*

 * Index of first quadlet to be interpreted; read/write.  If > 0, that many

 * quadlets at the beginning of each data block will be ignored, and all the

 * audio and MIDI quadlets will follow.

 */

#define RX_SEQ_START			0x014

#define RX_NUMBER_MIDI			0x014



/*

 * Names of all audio channels; read-only.  Quadlets are byte-swapped.  Names

sound/firewire/dice/dice-proc.c

+2 −2
Original line number Diff line number Diff line
@@ -99,9 +99,9 @@ static void dice_proc_read(struct snd_info_entry *entry, 
		} tx;

		struct {

			u32 iso;

			u32 seq_start;

			u32 number_audio;

			u32 number_midi;

			u32 seq_start;

			char names[RX_NAMES_SIZE];

			u32 ac3_caps;

			u32 ac3_enable;
@@ -204,10 +204,10 @@ static void dice_proc_read(struct snd_info_entry *entry, 
			break;

		snd_iprintf(buffer, "rx %u:\n", stream);

		snd_iprintf(buffer, "  iso channel: %d\n", (int)buf.rx.iso);

		snd_iprintf(buffer, "  sequence start: %u\n", buf.rx.seq_start);

		snd_iprintf(buffer, "  audio channels: %u\n",

			    buf.rx.number_audio);

		snd_iprintf(buffer, "  midi ports: %u\n", buf.rx.number_midi);

		snd_iprintf(buffer, "  sequence start: %u\n", buf.rx.seq_start);

		if (quadlets >= 68) {

			dice_proc_fixup_string(buf.rx.names, RX_NAMES_SIZE);

			snd_iprintf(buffer, "  names: %s\n", buf.rx.names);

sound/firewire/iso-resources.c

+1 −2
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ 
int fw_iso_resources_init(struct fw_iso_resources *r, struct fw_unit *unit)

{

	r->channels_mask = ~0uLL;

	r->unit = fw_unit_get(unit);

	r->unit = unit;

	mutex_init(&r->mutex);

	r->allocated = false;
@@ -42,7 +42,6 @@ void fw_iso_resources_destroy(struct fw_iso_resources *r) 
{

	WARN_ON(r->allocated);

	mutex_destroy(&r->mutex);

	fw_unit_put(r->unit);

}

EXPORT_SYMBOL(fw_iso_resources_destroy);

sound/pci/hda/hda_controller.c

+1 −1
Original line number Diff line number Diff line
@@ -1164,7 +1164,7 @@ static unsigned int azx_rirb_get_response(struct hda_bus *bus, 
		}

	}



	if (!bus->no_response_fallback)

	if (bus->no_response_fallback)

		return -1;



	if (!chip->polling_mode && chip->poll_count < 2) {