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

Commit 56b78921 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: (26 commits)
  ALSA: hdmi - show debug message on changing audio infoframe
  ALSA: hdmi - merge common code for intelhdmi and nvhdmi
  ALSA: hda - Add ASRock mobo to MSI blacklist
  ALSA: hda: uninitialized variable fix
  ALSA: hda: Use LPIB for a Biostar Microtech board
  ALSA: usb/audio.h: Fix field order
  ALSA: fix jazz16 compile (udelay)
  ALSA: hda: Use LPIB for Dell Latitude 131L
  ALSA: hda - Build hda_eld into snd-hda-codec module
  ALSA: hda - Support NVIDIA MCP89 and GT21x hdmi audio
  ALSA: hda - Support max codecs to 8 for nvidia hda controller
  ALSA: riptide: clean up while loop
  ALSA: usbaudio - remove debug "SAMPLE BYTES" printk line
  ALSA: timer - pass real event in snd_timer_notify1() to instance callback
  ALSA: oxygen: change || to &&
  ALSA: opti92x: use PnP data to select Master Control port
  ASoC: fix ak4104 register array access
  ASoC: soc_pcm_open: Add missing bailout tag
  ALSA: usbaudio: Fix wrong bitrate for Creative Creative VF0470 Live Cam
  ALSA: ua101: removing debugging code
  ...
parents 3c443cbc a3087ae9

Documentation/sound/alsa/ALSA-Configuration.txt

+1 −1
Original line number Diff line number Diff line
@@ -1812,7 +1812,7 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed. 
  Module snd-ua101

  ----------------



    Module for the Edirol UA-101 audio/MIDI interface.

    Module for the Edirol UA-101/UA-1000 audio/MIDI interfaces.



    This module supports multiple devices, autoprobe and hotplugging.

include/linux/usb/audio.h

+1 −1
Original line number Diff line number Diff line
@@ -269,8 +269,8 @@ struct uac_format_type_i_ext_descriptor { 
	__u8 bLength;

	__u8 bDescriptorType;

	__u8 bDescriptorSubtype;

	__u8 bSubslotSize;

	__u8 bFormatType;

	__u8 bSubslotSize;

	__u8 bBitResolution;

	__u8 bHeaderLength;

	__u8 bControlSize;

include/sound/asound.h

+1 −1
Original line number Diff line number Diff line
@@ -544,7 +544,7 @@ struct snd_rawmidi_status { 
 *  Timer section - /dev/snd/timer

 */



#define SNDRV_TIMER_VERSION		SNDRV_PROTOCOL_VERSION(2, 0, 5)

#define SNDRV_TIMER_VERSION		SNDRV_PROTOCOL_VERSION(2, 0, 6)



enum {

	SNDRV_TIMER_CLASS_NONE = -1,

sound/core/timer.c

+1 −1
Original line number Diff line number Diff line
@@ -393,7 +393,7 @@ static void snd_timer_notify1(struct snd_timer_instance *ti, int event) 
	    event == SNDRV_TIMER_EVENT_CONTINUE)

		resolution = snd_timer_resolution(ti);

	if (ti->ccallback)

		ti->ccallback(ti, SNDRV_TIMER_EVENT_START, &tstamp, resolution);

		ti->ccallback(ti, event, &tstamp, resolution);

	if (ti->flags & SNDRV_TIMER_IFLG_SLAVE)

		return;

	timer = ti->timer;

sound/isa/opti9xx/miro.c

+1 −1
Original line number Diff line number Diff line
@@ -1558,7 +1558,7 @@ static int __devinit snd_card_miro_pnp(struct snd_miro *chip, 


	err = pnp_activate_dev(devmc);

	if (err < 0) {

		snd_printk(KERN_ERR "OPL syntg pnp configure failure: %d\n",

		snd_printk(KERN_ERR "MC pnp configure failure: %d\n",

				    err);

		return err;

	}