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

Commit 8aa7ad90 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: sb16 - Fix build errors on MIPS and others with 13bit ioctl size
  ALSA: hdspm - Fix compile warnings with PPC
  ALSA: cs5535 - Fix invalid big-endian conversions
  ALSA: HDMI - fix ELD monitor name length
  ALSA: atmel - update author email for ABDAC, AC97C and AT73C213
  ALSA: HDA: Add model=auto quirk for Acer Aspire 3830TG
  ALSA: HDA: Add a new Conexant codec ID (506c)
parents 6e139047 4f3c7a18

include/sound/sb16_csp.h

+8 −1
Original line number Diff line number Diff line
@@ -99,7 +99,14 @@ struct snd_sb_csp_info { 
/* get CSP information */

#define SNDRV_SB_CSP_IOCTL_INFO		_IOR('H', 0x10, struct snd_sb_csp_info)

/* load microcode to CSP */

#define SNDRV_SB_CSP_IOCTL_LOAD_CODE	_IOW('H', 0x11, struct snd_sb_csp_microcode)

/* NOTE: struct snd_sb_csp_microcode overflows the max size (13 bits)

 * defined for some architectures like MIPS, and it leads to build errors.

 * (x86 and co have 14-bit size, thus it's valid, though.)

 * As a workaround for skipping the size-limit check, here we don't use the

 * normal _IOW() macro but _IOC() with the manual argument.

 */

#define SNDRV_SB_CSP_IOCTL_LOAD_CODE	\

	_IOC(_IOC_WRITE, 'H', 0x11, sizeof(struct snd_sb_csp_microcode))

/* unload microcode from CSP */

#define SNDRV_SB_CSP_IOCTL_UNLOAD_CODE	_IO('H', 0x12)

/* start CSP */

sound/atmel/abdac.c

+1 −1
Original line number Diff line number Diff line
@@ -599,4 +599,4 @@ module_exit(atmel_abdac_exit); 


MODULE_LICENSE("GPL");

MODULE_DESCRIPTION("Driver for Atmel Audio Bitstream DAC (ABDAC)");

MODULE_AUTHOR("Hans-Christian Egtvedt <hans-christian.egtvedt@atmel.com>");
 
MODULE_AUTHOR("Hans-Christian Egtvedt <egtvedt@samfundet.no>");

sound/atmel/ac97c.c

+1 −1
Original line number Diff line number Diff line
@@ -1199,4 +1199,4 @@ module_exit(atmel_ac97c_exit); 


MODULE_LICENSE("GPL");

MODULE_DESCRIPTION("Driver for Atmel AC97 controller");

MODULE_AUTHOR("Hans-Christian Egtvedt <hans-christian.egtvedt@atmel.com>");
 
MODULE_AUTHOR("Hans-Christian Egtvedt <egtvedt@samfundet.no>");

sound/pci/cs5535audio/cs5535audio_pcm.c

+2 −2
Original line number Diff line number Diff line
@@ -149,7 +149,7 @@ static int cs5535audio_build_dma_packets(struct cs5535audio *cs5535au, 
			&((struct cs5535audio_dma_desc *) dma->desc_buf.area)[i];

		desc->addr = cpu_to_le32(addr);

		desc->size = cpu_to_le32(period_bytes);

		desc->ctlreserved = cpu_to_le32(PRD_EOP);

		desc->ctlreserved = cpu_to_le16(PRD_EOP);

		desc_addr += sizeof(struct cs5535audio_dma_desc);

		addr += period_bytes;

	}
@@ -157,7 +157,7 @@ static int cs5535audio_build_dma_packets(struct cs5535audio *cs5535au, 
	lastdesc = &((struct cs5535audio_dma_desc *) dma->desc_buf.area)[periods];

	lastdesc->addr = cpu_to_le32((u32) dma->desc_buf.addr);

	lastdesc->size = 0;

	lastdesc->ctlreserved = cpu_to_le32(PRD_JMP);

	lastdesc->ctlreserved = cpu_to_le16(PRD_JMP);

	jmpprd_addr = cpu_to_le32(lastdesc->addr +

				  (sizeof(struct cs5535audio_dma_desc)*periods));

sound/pci/hda/hda_eld.c

+1 −1
Original line number Diff line number Diff line
@@ -294,7 +294,7 @@ static int hdmi_update_eld(struct hdmi_eld *e, 
		snd_printd(KERN_INFO "HDMI: out of range MNL %d\n", mnl);

		goto out_fail;

	} else

		strlcpy(e->monitor_name, buf + ELD_FIXED_BYTES, mnl);

		strlcpy(e->monitor_name, buf + ELD_FIXED_BYTES, mnl + 1);



	for (i = 0; i < e->sad_count; i++) {

		if (ELD_FIXED_BYTES + mnl + 3 * (i + 1) > size) {