Commit 3657423c 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: rawmidi: fix the get next midi device ioctl
  ALSA: hda - Fix wrong HP pin detection in snd_hda_parse_pin_def_config()
  ALSA: seq/oss - Fix double-free at error path of snd_seq_oss_open()
  ALSA: msnd-classic: Fix invalid cfg parameter
  ALSA: hda - Enable PC-beep for EeePC with ALC269 codec
  ALSA: hda - Add errata initverb sequence for CS42xx codecs
  ALSA: usb - Release capture substream URBs properly
  ALSA: virtuoso: fix setting of Xonar DS line-in/mic-in controls
  ALSA: virtuoso: work around missing reset in the Xonar DS Windows driver
  ALSA: hda - Add quirk for Lenovo T400s
  ALSA: usb-audio: fix detection of vendor-specific device protocol settings
  ALSA: usb-audio: Assume first control interface is for audio
  ALSA: hda - Add a new hp-laptop model for Conexant 5066, tested on HP G60
parents df423dc7 5431427b

Documentation/sound/alsa/HD-Audio-Models.txt

+1 −0
Original line number Diff line number Diff line
@@ -296,6 +296,7 @@ Conexant 5051 
Conexant 5066

=============

  laptop	Basic Laptop config (default)

  hp-laptop	HP laptops, e g G60

  dell-laptop	Dell laptops

  dell-vostro	Dell Vostro

  olpc-xo-1_5	OLPC XO 1.5

sound/core/rawmidi.c

+2 −0
Original line number Diff line number Diff line
@@ -829,6 +829,8 @@ static int snd_rawmidi_control_ioctl(struct snd_card *card, 
		

		if (get_user(device, (int __user *)argp))

			return -EFAULT;

		if (device >= SNDRV_RAWMIDI_DEVICES) /* next device is -1 */

			device = SNDRV_RAWMIDI_DEVICES - 1;

		mutex_lock(&register_mutex);

		device = device < 0 ? 0 : device + 1;

		while (device < SNDRV_RAWMIDI_DEVICES) {

sound/core/seq/oss/seq_oss_init.c

+4 −5
Original line number Diff line number Diff line
@@ -281,13 +281,10 @@ snd_seq_oss_open(struct file *file, int level) 
	return 0;



 _error:

	snd_seq_oss_writeq_delete(dp->writeq);

	snd_seq_oss_readq_delete(dp->readq);

	snd_seq_oss_synth_cleanup(dp);

	snd_seq_oss_midi_cleanup(dp);

	delete_port(dp);

	delete_seq_queue(dp->queue);

	kfree(dp);

	delete_port(dp);



	return rc;

}
@@ -350,8 +347,10 @@ create_port(struct seq_oss_devinfo *dp) 
static int

delete_port(struct seq_oss_devinfo *dp)

{

	if (dp->port < 0)

	if (dp->port < 0) {

		kfree(dp);

		return 0;

	}



	debug_printk(("delete_port %i\n", dp->port));

	return snd_seq_event_port_detach(dp->cseq, dp->port);

sound/isa/msnd/msnd_pinnacle.c

+6 −2
Original line number Diff line number Diff line
@@ -764,9 +764,9 @@ static long io[SNDRV_CARDS] = SNDRV_DEFAULT_PORT; 
static int irq[SNDRV_CARDS] = SNDRV_DEFAULT_IRQ;

static long mem[SNDRV_CARDS] = SNDRV_DEFAULT_PORT;



#ifndef MSND_CLASSIC

static long cfg[SNDRV_CARDS] = SNDRV_DEFAULT_PORT;



#ifndef MSND_CLASSIC

/* Extra Peripheral Configuration (Default: Disable) */

static long ide_io0[SNDRV_CARDS] = SNDRV_DEFAULT_PORT;

static long ide_io1[SNDRV_CARDS] = SNDRV_DEFAULT_PORT;
@@ -894,7 +894,11 @@ static int __devinit snd_msnd_isa_probe(struct device *pdev, unsigned int idx) 
	struct snd_card *card;

	struct snd_msnd *chip;



	if (has_isapnp(idx) || cfg[idx] == SNDRV_AUTO_PORT) {

	if (has_isapnp(idx)

#ifndef MSND_CLASSIC

	    || cfg[idx] == SNDRV_AUTO_PORT

#endif

	    ) {

		printk(KERN_INFO LOGNAME ": Assuming PnP mode\n");

		return -ENODEV;

	}

sound/pci/hda/hda_codec.c

+1 −1
Original line number Diff line number Diff line
@@ -4536,7 +4536,7 @@ int snd_hda_parse_pin_def_config(struct hda_codec *codec, 
			cfg->hp_outs--;

			memmove(cfg->hp_pins + i, cfg->hp_pins + i + 1,

				sizeof(cfg->hp_pins[0]) * (cfg->hp_outs - i));

			memmove(sequences_hp + i - 1, sequences_hp + i,

			memmove(sequences_hp + i, sequences_hp + i + 1,

				sizeof(sequences_hp[0]) * (cfg->hp_outs - i));

		}

	}

CRA Git | Maintained and supported by SUSTech CRA and CCSE