diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-07-02 09:26:53 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-07-02 09:26:53 -0700 |
| commit | 8aa7ad9018d7fa1e52d2ee350a2f62c5485d3fec (patch) | |
| tree | 67982a268cc4573aba1df10725019418b207d442 /include | |
| parent | 6e139047e2eecd0ccf8bc2f1564e82747cb6e56c (diff) | |
| parent | 4f3c7a18d9e8a287d31f828a259d713fe4859471 (diff) | |
| download | linux-8aa7ad9018d7fa1e52d2ee350a2f62c5485d3fec.tar.bz2 | |
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)
Diffstat (limited to 'include')
| -rw-r--r-- | include/sound/sb16_csp.h | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/include/sound/sb16_csp.h b/include/sound/sb16_csp.h index 736eac71d053..af1b49e982df 100644 --- a/include/sound/sb16_csp.h +++ b/include/sound/sb16_csp.h @@ -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 */ |