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

Commit 20e471fd authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull sound fixes from Takashi Iwai:
 "Here are a few fixes that have landed after the previous pull request.
  All are driver specific fixes including:

   - error/int value fixes in OXFW,
   - Intel Skylake HD-audio HDMI codec support,
   - Additional HD-audio Realtek codecs and AD1986A codec fixes/quirks,
   - a few more DSD support and a quirk for Arcam rPAC in usb-audio,
   - a typo fix for Scarlett 6i6,
   - fixes for new ASIHPI firmware,
   - ASoC Exynos7 cleanups,
   - Intel ACPI support, and
   - a fix for PCM512 register cache sync"

* tag 'sound-fix-3.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound: (24 commits)
  ALSA: usb-audio: extend KEF X300A FU 10 tweak to Arcam rPAC
  ALSA: hda/realtek - New codec support for ALC298
  ALSA: asihpi: update to HPI version 4.14
  ALSA: asihpi: increase tuner pad cache size
  ALSA: asihpi: relax firmware version check
  ALSA: usb-audio: Fix Scarlett 6i6 initialization typo
  ALSA: hda - Add quirk for Packard Bell EasyNote MX65
  ALSA: usb-audio: add native DSD support for Matrix Audio DACs
  ALSA: hda/realtek - New codec support for ALC256
  ALSA: hda/realtek - Add new Dell desktop for ALC3234 headset mode
  ASoC: Intel: fix possible acpi enumeration panic
  ALSA: hda/hdmi - apply Haswell fix-ups to Skylake display codec
  ASoC: Intel: fix return value check in sst_acpi_probe()
  ALSA: hda - Make add_stereo_mix_input flag tristate
  ALSA: hda - Create capture source ctls when stereo mix input is added
  ALSA: hda - Fix typos in snd_hda_get_int_hint() kerneldoc comments
  ALSA: hda - add codec ID for Skylake display audio codec
  ALSA: oxfw: some signedness bugs
  ALSA: oxfw: fix detect_loud_models() return value
  ASoC: rt5677: add REGMAP_I2C and REGMAP_IRQ dependency
  ...
parents ed55635e d70a1b98

sound/firewire/oxfw/oxfw-pcm.c

+3 −3
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ static int hw_rule_rate(struct snd_pcm_hw_params *params, 
		.min = UINT_MAX, .max = 0, .integer = 1

	};

	struct snd_oxfw_stream_formation formation;

	unsigned int i, err;

	int i, err;



	for (i = 0; i < SND_OXFW_STREAM_FORMAT_ENTRIES; i++) {

		if (formats[i] == NULL)
@@ -47,7 +47,7 @@ static int hw_rule_channels(struct snd_pcm_hw_params *params, 
	const struct snd_interval *r =

		hw_param_interval_c(params, SNDRV_PCM_HW_PARAM_RATE);

	struct snd_oxfw_stream_formation formation;

	unsigned int i, j, err;

	int i, j, err;

	unsigned int count, list[SND_OXFW_STREAM_FORMAT_ENTRIES] = {0};



	count = 0;
@@ -80,7 +80,7 @@ static int hw_rule_channels(struct snd_pcm_hw_params *params, 
static void limit_channels_and_rates(struct snd_pcm_hardware *hw, u8 **formats)

{

	struct snd_oxfw_stream_formation formation;

	unsigned int i, err;

	int i, err;



	hw->channels_min = UINT_MAX;

	hw->channels_max = 0;

sound/firewire/oxfw/oxfw-proc.c

+1 −1
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ static void proc_read_formation(struct snd_info_entry *entry, 
	struct snd_oxfw_stream_formation formation, curr;

	u8 *format;

	char flag;

	unsigned int i, err;

	int i, err;



	/* Show input. */

	err = snd_oxfw_stream_get_current_formation(oxfw,

sound/firewire/oxfw/oxfw-stream.c

+2 −1
Original line number Diff line number Diff line
@@ -61,7 +61,8 @@ static int set_stream_format(struct snd_oxfw *oxfw, struct amdtp_stream *s, 
	u8 **formats;

	struct snd_oxfw_stream_formation formation;

	enum avc_general_plug_dir dir;

	unsigned int i, err, len;

	unsigned int len;

	int i, err;



	if (s == &oxfw->tx_stream) {

		formats = oxfw->tx_stream_formats;

sound/firewire/oxfw/oxfw.c

+1 −1
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ static bool detect_loud_models(struct fw_unit *unit) 
	err = fw_csr_string(unit->directory, CSR_MODEL,

			    model, sizeof(model));

	if (err < 0)

		return err;

		return false;



	for (i = 0; i < ARRAY_SIZE(models); i++) {

		if (strcmp(models[i], model) == 0)

sound/pci/asihpi/hpi_internal.h

+3 −3
Original line number Diff line number Diff line
@@ -1367,9 +1367,9 @@ struct hpi_control_cache_single { 
struct hpi_control_cache_pad {

	struct hpi_control_cache_info i;

	u32 field_valid_flags;

	u8 c_channel[8];

	u8 c_artist[40];

	u8 c_title[40];

	u8 c_channel[40];

	u8 c_artist[100];

	u8 c_title[100];

	u8 c_comment[200];

	u32 pTY;

	u32 pI;