tmakin/ack-tegra
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6

Browse Source 
* '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)
This commit is contained in:
Linus Torvalds
2011-07-02 09:26:53 -07:00
parent 6e139047e2 4f3c7a18d9
commit 8aa7ad9018
8 changed files with 22 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/sound/sb16_csp.h
+8 -1
View File
@@ -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 */