Commit 962556b5 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull sound fixes from Takashi Iwai:
 "We've got slightly more fixes than wished, but heading to a good
  shape. Most of changes are about HD-audio fixes, one for a buggy code
  that went into 4.13, and another for avoiding a crash due to buggy
  BIOS.

  Apart from HD-audio, a sequencer core change that is only for UP
  config (which must be pretty rare nowadays), and a USB-audio quirk as
  usual"

* tag 'sound-4.14-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound:
  ALSA: hda - Fix incorrect TLV callback check introduced during set_fs() removal
  ALSA: hda: Remove superfluous '-' added by printk conversion
  ALSA: hda: Abort capability probe at invalid register read
  ALSA: seq: Enable 'use' locking in all configurations
  ALSA: usb-audio: Add native DSD support for Pro-Ject Pre Box S2 Digital
parents 73d3393a a91d6612

include/sound/control.h

+3 −0
Original line number Diff line number Diff line
@@ -248,6 +248,9 @@ int snd_ctl_add_vmaster_hook(struct snd_kcontrol *kctl, 
			     void *private_data);

void snd_ctl_sync_vmaster(struct snd_kcontrol *kctl, bool hook_only);

#define snd_ctl_sync_vmaster_hook(kctl)	snd_ctl_sync_vmaster(kctl, true)

int snd_ctl_apply_vmaster_slaves(struct snd_kcontrol *kctl,

				 int (*func)(struct snd_kcontrol *, void *),

				 void *arg);



/*

 * Helper functions for jack-detection controls

sound/core/seq/seq_lock.c

+0 −4
Original line number Diff line number Diff line
@@ -23,8 +23,6 @@ 
#include <sound/core.h>

#include "seq_lock.h"



#if defined(CONFIG_SMP) || defined(CONFIG_SND_DEBUG)



/* wait until all locks are released */

void snd_use_lock_sync_helper(snd_use_lock_t *lockp, const char *file, int line)

{
@@ -41,5 +39,3 @@ void snd_use_lock_sync_helper(snd_use_lock_t *lockp, const char *file, int line) 
	}

}

EXPORT_SYMBOL(snd_use_lock_sync_helper);
 


#endif

sound/core/seq/seq_lock.h

+0 −12
Original line number Diff line number Diff line
@@ -3,8 +3,6 @@ 


#include <linux/sched.h>



#if defined(CONFIG_SMP) || defined(CONFIG_SND_DEBUG)



typedef atomic_t snd_use_lock_t;



/* initialize lock */
@@ -20,14 +18,4 @@ typedef atomic_t snd_use_lock_t; 
void snd_use_lock_sync_helper(snd_use_lock_t *lock, const char *file, int line);

#define snd_use_lock_sync(lockp) snd_use_lock_sync_helper(lockp, __BASE_FILE__, __LINE__)



#else /* SMP || CONFIG_SND_DEBUG */



typedef spinlock_t snd_use_lock_t;	/* dummy */

#define snd_use_lock_init(lockp) /**/

#define snd_use_lock_use(lockp) /**/

#define snd_use_lock_free(lockp) /**/

#define snd_use_lock_sync(lockp) /**/



#endif /* SMP || CONFIG_SND_DEBUG */



#endif /* __SND_SEQ_LOCK_H */

sound/core/vmaster.c

+31 −0
Original line number Diff line number Diff line
@@ -484,3 +484,34 @@ void snd_ctl_sync_vmaster(struct snd_kcontrol *kcontrol, bool hook_only) 
		master->hook(master->hook_private_data, master->val);

}

EXPORT_SYMBOL_GPL(snd_ctl_sync_vmaster);



/**

 * snd_ctl_apply_vmaster_slaves - Apply function to each vmaster slave

 * @kctl: vmaster kctl element

 * @func: function to apply

 * @arg: optional function argument

 *

 * Apply the function @func to each slave kctl of the given vmaster kctl.

 * Returns 0 if successful, or a negative error code.

 */

int snd_ctl_apply_vmaster_slaves(struct snd_kcontrol *kctl,

				 int (*func)(struct snd_kcontrol *, void *),

				 void *arg)

{

	struct link_master *master;

	struct link_slave *slave;

	int err;



	master = snd_kcontrol_chip(kctl);

	err = master_init(master);

	if (err < 0)

		return err;

	list_for_each_entry(slave, &master->slaves, list) {

		err = func(&slave->slave, arg);

		if (err < 0)

			return err;

	}



	return 0;

}

EXPORT_SYMBOL_GPL(snd_ctl_apply_vmaster_slaves);

sound/hda/hdac_controller.c

+5 −0
Original line number Diff line number Diff line
@@ -284,6 +284,11 @@ int snd_hdac_bus_parse_capabilities(struct hdac_bus *bus) 
		dev_dbg(bus->dev, "HDA capability ID: 0x%x\n",

			(cur_cap & AZX_CAP_HDR_ID_MASK) >> AZX_CAP_HDR_ID_OFF);



		if (cur_cap == -1) {

			dev_dbg(bus->dev, "Invalid capability reg read\n");

			break;

		}



		switch ((cur_cap & AZX_CAP_HDR_ID_MASK) >> AZX_CAP_HDR_ID_OFF) {

		case AZX_ML_CAP_ID:

			dev_dbg(bus->dev, "Found ML capability\n");

CRA Git | Maintained and supported by SUSTech CRA and CCSE