Commit d5d6eba9 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: snd-aica: declare MODULE_FIRMWARE
  ALSA: hda - Don't initialize CORB/RIRB for single_cmd mode
  ALSA: usb-audio: fix combine_word problem
  sound: Replace old style lock initializer
  ASoC: S3C64XX I2S: Enable audio-bus clock
  ASoC: OMAP: Don't try to set unsupported OMAP_DMA_DATA_BURST_16 on OMAP1
  ALSA: hda, move hp_bseries_system
  sound: Use KERN_WARNING instead of KERN_WARN, which does not exist
  ALSA: intel8x0: Mute External Amplifier by default for another Sony model
  ALSA: hda - Add OLPC XO-1.5 PCI ID
  ALSA: hda - Enable GPIO control for mute LED on HP systems
parents f0ede3f3 dede17b8

sound/oss/dmasound/dmasound_core.c

+3 −1
Original line number Diff line number Diff line
@@ -219,7 +219,9 @@ static int shared_resources_initialised; 
     *  Mid level stuff

     */



struct sound_settings dmasound = { .lock = SPIN_LOCK_UNLOCKED };

struct sound_settings dmasound = {

	.lock = __SPIN_LOCK_UNLOCKED(dmasound.lock)

};



static inline void sound_silence(void)

{

sound/oss/sb_common.c

+2 −2
Original line number Diff line number Diff line
@@ -157,7 +157,7 @@ static void sb_intr (sb_devc *devc) 
				break;



			default:

				/* printk(KERN_WARN "Sound Blaster: Unexpected interrupt\n"); */

				/* printk(KERN_WARNING "Sound Blaster: Unexpected interrupt\n"); */

				;

		}

	}
@@ -177,7 +177,7 @@ static void sb_intr (sb_devc *devc) 
				break;



			default:

				/* printk(KERN_WARN "Sound Blaster: Unexpected interrupt\n"); */

				/* printk(KERN_WARNING "Sound Blaster: Unexpected interrupt\n"); */

				;

		}

	}

sound/oss/sb_ess.c

+1 −1
Original line number Diff line number Diff line
@@ -782,7 +782,7 @@ printk(KERN_INFO "FKS: ess_handle_channel %s irq_mode=%d\n", channel, irq_mode); 
			break;



		default:;

			/* printk(KERN_WARN "ESS: Unexpected interrupt\n"); */

			/* printk(KERN_WARNING "ESS: Unexpected interrupt\n"); */

	}

}

sound/pci/hda/hda_intel.c

+8 −4
Original line number Diff line number Diff line
@@ -722,9 +722,10 @@ static unsigned int azx_rirb_get_response(struct hda_bus *bus, 
		   chip->last_cmd[addr]);

	chip->single_cmd = 1;

	bus->response_reset = 0;

	/* re-initialize CORB/RIRB */

	/* release CORB/RIRB */

	azx_free_cmd_io(chip);

	azx_init_cmd_io(chip);

	/* disable unsolicited responses */

	azx_writel(chip, GCTL, azx_readl(chip, GCTL) & ~ICH6_GCTL_UNSOL);

	return -1;

}
@@ -865,7 +866,9 @@ static int azx_reset(struct azx *chip) 
	}



	/* Accept unsolicited responses */

	azx_writel(chip, GCTL, azx_readl(chip, GCTL) | ICH6_GCTL_UNSOL);

	if (!chip->single_cmd)

		azx_writel(chip, GCTL, azx_readl(chip, GCTL) |

			   ICH6_GCTL_UNSOL);



	/* detect codecs */

	if (!chip->codec_mask) {
@@ -980,6 +983,7 @@ static void azx_init_chip(struct azx *chip) 
	azx_int_enable(chip);



	/* initialize the codec command I/O */

	if (!chip->single_cmd)

		azx_init_cmd_io(chip);



	/* program the position buffer */

sound/pci/hda/patch_conexant.c

+1 −0
Original line number Diff line number Diff line
@@ -2325,6 +2325,7 @@ static struct snd_pci_quirk cxt5066_cfg_tbl[] = { 
		      CXT5066_LAPTOP),

	SND_PCI_QUIRK(0x1028, 0x02f5, "Dell",

		      CXT5066_DELL_LAPTOP),

	SND_PCI_QUIRK(0x152d, 0x0833, "OLPC XO-1.5", CXT5066_OLPC_XO_1_5),

	{}

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE