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

Commit 5f237425 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull sound fixes from Takashi Iwai:
 "Here are a few more ASoC changes that have been gathered since rc1,
  but it's still fairly calm over all.  The only largish LOC is found in
  atmel driver, and it's just a removal of broken non-DT stuff.  The
  rest are all small driver-specific fixes, nothing to worry much"

* tag 'sound-4.0-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound: (26 commits)
  ALSA: hda - One more Dell macine needs DELL1_MIC_NO_PRESENCE quirk
  ALSA: opl3: small array underflow
  ALSA: line6: Clamp values correctly
  ALSA: msnd: add some missing curly braces
  ASoC: omap-pcm: Correct dma mask
  ASoC: simple-card: Add a NULL pointer check in asoc_simple_card_dai_link_of
  ASoC: sam9g20_wm8731: drop machine_is_xxx
  ALSA: dice: fix wrong offsets for Dice interface
  ALSA: oxfw: fix a condition and return code in start_stream()
  ASoC: OMAP: mcbsp: Fix CLKX and CLKR pinmux when used as inputs
  ASoC: rt5677: Correct the routing paths of that after IF1/2 DACx Mux
  ASoC: sta32x: fix register range in regmap.
  ASoC: rt5670: Set RT5670_IRQ_CTRL1 non volatile
  ASoC: Intel: reset the DSP while suspending
  ASoC: Intel: save and restore the CSR register
  ASoC: Intel: update MMX ID to 3
  ASoC: max98357a: Add missing header files
  ASoC: cirrus: tlv320aic23 needs I2C
  ASoC: Samsung: add missing I2C/SPI dependencies
  ASoC: rt5670: Fix the speaker mono output issue
  ...
parents 39ed853a 4fda87df

sound/drivers/opl3/opl3_midi.c

+2 −0
Original line number Diff line number Diff line
@@ -105,6 +105,8 @@ static void snd_opl3_calc_pitch(unsigned char *fnum, unsigned char *blocknum, 
		int pitchbend = chan->midi_pitchbend;

		int segment;



		if (pitchbend < -0x2000)

			pitchbend = -0x2000;

		if (pitchbend > 0x1FFF)

			pitchbend = 0x1FFF;

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			0x010

#define RX_NUMBER_AUDIO			0x00c



/*

 * 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			0x014

#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



/*

 * 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/oxfw/oxfw-stream.c

+3 −2
Original line number Diff line number Diff line
@@ -171,9 +171,10 @@ static int start_stream(struct snd_oxfw *oxfw, struct amdtp_stream *stream, 
	}



	/* Wait first packet */

	err = amdtp_stream_wait_callback(stream, CALLBACK_TIMEOUT);

	if (err < 0)

	if (!amdtp_stream_wait_callback(stream, CALLBACK_TIMEOUT)) {

		stop_stream(oxfw, stream);

		err = -ETIMEDOUT;

	}

end:

	return err;

}

sound/isa/msnd/msnd_pinnacle_mixer.c

+2 −1
Original line number Diff line number Diff line
@@ -306,11 +306,12 @@ int snd_msndmix_new(struct snd_card *card) 
	spin_lock_init(&chip->mixer_lock);

	strcpy(card->mixername, "MSND Pinnacle Mixer");



	for (idx = 0; idx < ARRAY_SIZE(snd_msnd_controls); idx++)

	for (idx = 0; idx < ARRAY_SIZE(snd_msnd_controls); idx++) {

		err = snd_ctl_add(card,

				  snd_ctl_new1(snd_msnd_controls + idx, chip));

		if (err < 0)

			return err;

	}



	return 0;

}