Commit 3ee8da87 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6 

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6:
  ALSA: hda - Fix the cmd cache keys for amp verbs
  ALSA: add missing definitions(letters) to HD-Audio.txt
  ALSA: hda - Add quirk mask for Fujitsu Amilo laptops with ALC883
  [ALSA] intel8x0: add one retry to the ac97_clock measurement routine
  [ALSA] intel8x0: fix wrong conditions in ac97_clock measure routine
  ALSA: hda - Avoid call of snd_jack_report at release
  ALSA: add private_data to struct snd_jack
  ALSA: snd-usb-caiaq: rename files to remove redundant information in file pathes
  ALSA: snd-usb-caiaq: clean up header includes
  ALSA: sound/pci: use memdup_user()
  ALSA: sound/usb: use memdup_user()
  ALSA: sound/isa: use memdup_user()
  ALSA: sound/core: use memdup_user()
  [ALSA] intel8x0: do not use zero value from PICB register
  [ALSA] intel8x0: an attempt to make ac97_clock measurement more reliable
  [ALSA] pcm-midlevel: Add more strict buffer position checks based on jiffies
  [ALSA] hda_intel: fix unexpected ring buffer positions
  ASoC: Disable S3C64xx support in Kconfig
  ASoC: magician: remove un-necessary #include of pxa-regs.h and hardware.h
parents a2c252eb 9dd175f7

Documentation/sound/alsa/HD-Audio.txt

+2 −2
Original line number Diff line number Diff line
@@ -169,7 +169,7 @@ PCI SSID look-up. 
What `model` option values are available depends on the codec chip.

Check your codec chip from the codec proc file (see "Codec Proc-File"

section below).  It will show the vendor/product name of your codec

chip.  Then, see Documentation/sound/alsa/HD-Audio-Modelstxt file,

chip.  Then, see Documentation/sound/alsa/HD-Audio-Models.txt file,

the section of HD-audio driver.  You can find a list of codecs

and `model` options belonging to each codec.  For example, for Realtek

ALC262 codec chip, pass `model=ultra` for devices that are compatible
@@ -177,7 +177,7 @@ with Samsung Q1 Ultra. 


Thus, the first thing you can do for any brand-new, unsupported and

non-working HD-audio hardware is to check HD-audio codec and several

different `model` option values.  If you have a luck, some of them

different `model` option values.  If you have any luck, some of them

might suit with your device well.



Some codecs such as ALC880 have a special model option `model=test`.

include/sound/jack.h

+2 −0
Original line number Diff line number Diff line
@@ -50,6 +50,8 @@ struct snd_jack { 
	int type;

	const char *id;

	char name[100];

	void *private_data;

	void (*private_free)(struct snd_jack *);

};



#ifdef CONFIG_SND_JACK

include/sound/pcm.h

+2 −1
Original line number Diff line number Diff line
@@ -269,6 +269,7 @@ struct snd_pcm_runtime { 
	snd_pcm_uframes_t avail_max;

	snd_pcm_uframes_t hw_ptr_base;	/* Position at buffer restart */

	snd_pcm_uframes_t hw_ptr_interrupt; /* Position at interrupt time */

	unsigned long hw_ptr_jiffies;	/* Time when hw_ptr is updated */



	/* -- HW params -- */

	snd_pcm_access_t access;	/* access mode */

sound/core/control.c

+13 −22
Original line number Diff line number Diff line
@@ -724,13 +724,10 @@ static int snd_ctl_elem_read_user(struct snd_card *card, 
	struct snd_ctl_elem_value *control;

	int result;



	control = kmalloc(sizeof(*control), GFP_KERNEL);

	if (control == NULL)

		return -ENOMEM;	

	if (copy_from_user(control, _control, sizeof(*control))) {

		kfree(control);

		return -EFAULT;

	}

	control = memdup_user(_control, sizeof(*control));

	if (IS_ERR(control))

		return PTR_ERR(control);



	snd_power_lock(card);

	result = snd_power_wait(card, SNDRV_CTL_POWER_D0);

	if (result >= 0)
@@ -784,13 +781,10 @@ static int snd_ctl_elem_write_user(struct snd_ctl_file *file, 
	struct snd_card *card;

	int result;



	control = kmalloc(sizeof(*control), GFP_KERNEL);

	if (control == NULL)

		return -ENOMEM;	

	if (copy_from_user(control, _control, sizeof(*control))) {

		kfree(control);

		return -EFAULT;

	}

	control = memdup_user(_control, sizeof(*control));

	if (IS_ERR(control))

		return PTR_ERR(control);



	card = file->card;

	snd_power_lock(card);

	result = snd_power_wait(card, SNDRV_CTL_POWER_D0);
@@ -916,13 +910,10 @@ static int snd_ctl_elem_user_tlv(struct snd_kcontrol *kcontrol, 
	if (op_flag > 0) {

		if (size > 1024 * 128)	/* sane value */

			return -EINVAL;

		new_data = kmalloc(size, GFP_KERNEL);

		if (new_data == NULL)

			return -ENOMEM;

		if (copy_from_user(new_data, tlv, size)) {

			kfree(new_data);

			return -EFAULT;

		}



		new_data = memdup_user(tlv, size);

		if (IS_ERR(new_data))

			return PTR_ERR(new_data);

		change = ue->tlv_data_size != size;

		if (!change)

			change = memcmp(ue->tlv_data, new_data, size);

sound/core/jack.c

+3 −0
Original line number Diff line number Diff line
@@ -35,6 +35,9 @@ static int snd_jack_dev_free(struct snd_device *device) 
{

	struct snd_jack *jack = device->device_data;



	if (jack->private_free)

		jack->private_free(jack);



	/* If the input device is registered with the input subsystem

	 * then we need to use a different deallocator. */

	if (jack->registered)

CRA Git | Maintained and supported by SUSTech CRA and CCSE