Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
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)
+22
-11
+8
-1
include/sound/sb16_csp.h
+8
-1
include/sound/sb16_csp.h
···
99
99
/* get CSP information */
100
100
#define SNDRV_SB_CSP_IOCTL_INFO _IOR('H', 0x10, struct snd_sb_csp_info)
101
101
/* load microcode to CSP */
102
-
#define SNDRV_SB_CSP_IOCTL_LOAD_CODE _IOW('H', 0x11, struct snd_sb_csp_microcode)
102
+
/* NOTE: struct snd_sb_csp_microcode overflows the max size (13 bits)
103
+
* defined for some architectures like MIPS, and it leads to build errors.
104
+
* (x86 and co have 14-bit size, thus it's valid, though.)
105
+
* As a workaround for skipping the size-limit check, here we don't use the
106
+
* normal _IOW() macro but _IOC() with the manual argument.
107
+
*/
108
+
#define SNDRV_SB_CSP_IOCTL_LOAD_CODE \
109
+
_IOC(_IOC_WRITE, 'H', 0x11, sizeof(struct snd_sb_csp_microcode))
103
110
/* unload microcode from CSP */
104
111
#define SNDRV_SB_CSP_IOCTL_UNLOAD_CODE _IO('H', 0x12)
105
112
/* start CSP */
+1
-1
sound/atmel/abdac.c
+1
-1
sound/atmel/abdac.c
+1
-1
sound/atmel/ac97c.c
+1
-1
sound/atmel/ac97c.c
+2
-2
sound/pci/cs5535audio/cs5535audio_pcm.c
+2
-2
sound/pci/cs5535audio/cs5535audio_pcm.c
···
149
149
&((struct cs5535audio_dma_desc *) dma->desc_buf.area)[i];
150
150
desc->addr = cpu_to_le32(addr);
151
151
desc->size = cpu_to_le32(period_bytes);
152
-
desc->ctlreserved = cpu_to_le32(PRD_EOP);
152
+
desc->ctlreserved = cpu_to_le16(PRD_EOP);
153
153
desc_addr += sizeof(struct cs5535audio_dma_desc);
154
154
addr += period_bytes;
155
155
}
···
157
157
lastdesc = &((struct cs5535audio_dma_desc *) dma->desc_buf.area)[periods];
158
158
lastdesc->addr = cpu_to_le32((u32) dma->desc_buf.addr);
159
159
lastdesc->size = 0;
160
-
lastdesc->ctlreserved = cpu_to_le32(PRD_JMP);
160
+
lastdesc->ctlreserved = cpu_to_le16(PRD_JMP);
161
161
jmpprd_addr = cpu_to_le32(lastdesc->addr +
162
162
(sizeof(struct cs5535audio_dma_desc)*periods));
163
163
+1
-1
sound/pci/hda/hda_eld.c
+1
-1
sound/pci/hda/hda_eld.c
···
294
294
snd_printd(KERN_INFO "HDMI: out of range MNL %d\n", mnl);
295
295
goto out_fail;
296
296
} else
297
-
strlcpy(e->monitor_name, buf + ELD_FIXED_BYTES, mnl);
297
+
strlcpy(e->monitor_name, buf + ELD_FIXED_BYTES, mnl + 1);
298
298
299
299
for (i = 0; i < e->sad_count; i++) {
300
300
if (ELD_FIXED_BYTES + mnl + 3 * (i + 1) > size) {
+4
sound/pci/hda/patch_conexant.c
+4
sound/pci/hda/patch_conexant.c
···
3074
3074
};
3075
3075
3076
3076
static const struct snd_pci_quirk cxt5066_cfg_tbl[] = {
3077
+
SND_PCI_QUIRK(0x1025, 0x054c, "Acer Aspire 3830TG", CXT5066_AUTO),
3077
3078
SND_PCI_QUIRK_MASK(0x1025, 0xff00, 0x0400, "Acer", CXT5066_IDEAPAD),
3078
3079
SND_PCI_QUIRK(0x1028, 0x02d8, "Dell Vostro", CXT5066_DELL_VOSTRO),
3079
3080
SND_PCI_QUIRK(0x1028, 0x02f5, "Dell Vostro 320", CXT5066_IDEAPAD),
···
4390
4389
.patch = patch_cxt5066 },
4391
4390
{ .id = 0x14f15069, .name = "CX20585",
4392
4391
.patch = patch_cxt5066 },
4392
+
{ .id = 0x14f1506c, .name = "CX20588",
4393
+
.patch = patch_cxt5066 },
4393
4394
{ .id = 0x14f1506e, .name = "CX20590",
4394
4395
.patch = patch_cxt5066 },
4395
4396
{ .id = 0x14f15097, .name = "CX20631",
···
4420
4417
MODULE_ALIAS("snd-hda-codec-id:14f15067");
4421
4418
MODULE_ALIAS("snd-hda-codec-id:14f15068");
4422
4419
MODULE_ALIAS("snd-hda-codec-id:14f15069");
4420
+
MODULE_ALIAS("snd-hda-codec-id:14f1506c");
4423
4421
MODULE_ALIAS("snd-hda-codec-id:14f1506e");
4424
4422
MODULE_ALIAS("snd-hda-codec-id:14f15097");
4425
4423
MODULE_ALIAS("snd-hda-codec-id:14f15098");
+4
-4
sound/pci/rme9652/hdspm.c
+4
-4
sound/pci/rme9652/hdspm.c
···
896
896
unsigned char max_channels_in;
897
897
unsigned char max_channels_out;
898
898
899
-
char *channel_map_in;
900
-
char *channel_map_out;
899
+
signed char *channel_map_in;
900
+
signed char *channel_map_out;
901
901
902
-
char *channel_map_in_ss, *channel_map_in_ds, *channel_map_in_qs;
903
-
char *channel_map_out_ss, *channel_map_out_ds, *channel_map_out_qs;
902
+
signed char *channel_map_in_ss, *channel_map_in_ds, *channel_map_in_qs;
903
+
signed char *channel_map_out_ss, *channel_map_out_ds, *channel_map_out_qs;
904
904
905
905
char **port_names_in;
906
906
char **port_names_out;
+1
-1
sound/spi/at73c213.c
+1
-1
sound/spi/at73c213.c
···
1124
1124
}
1125
1125
module_exit(at73c213_exit);
1126
1126
1127
-
MODULE_AUTHOR("Hans-Christian Egtvedt <hcegtvedt@atmel.com>");
1127
+
MODULE_AUTHOR("Hans-Christian Egtvedt <egtvedt@samfundet.no>");
1128
1128
MODULE_DESCRIPTION("Sound driver for AT73C213 with Atmel SSC");
1129
1129
MODULE_LICENSE("GPL");