aboutsummaryrefslogtreecommitdiff
path: root/sound
diff options
context:
space:
mode:
authorBen Hutchings <ben@decadent.org.uk>2010-09-12 02:41:47 +0100
committerGreg Kroah-Hartman <gregkh@suse.de>2011-05-09 15:55:17 -0700
commit873b0cdbacf834191ea935eb42396337d1c08dd0 (patch)
tree58a89aa7528d4773b4f66b79e4c9d80dbac2b66c /sound
parent7f81077f41950f73163672fdaed7fa6951fc69b3 (diff)
downloadlinux-linaro-stable-873b0cdbacf834191ea935eb42396337d1c08dd0.tar.gz
ALSA: emux: Add trivial compat ioctl handler
commit a254dba37c5a372fc8b44ba29509ba052d4e859d upstream. Reported-by: Carmen Cru <carmen.cru@belgacom.net> Signed-off-by: Ben Hutchings <ben@decadent.org.uk> Signed-off-by: Takashi Iwai <tiwai@suse.de> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'sound')
-rw-r--r--sound/synth/emux/emux_hwdep.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/sound/synth/emux/emux_hwdep.c b/sound/synth/emux/emux_hwdep.c
index ff0b2a8fd25b..5ae1eae9f6db 100644
--- a/sound/synth/emux/emux_hwdep.c
+++ b/sound/synth/emux/emux_hwdep.c
@@ -128,6 +128,9 @@ snd_emux_init_hwdep(struct snd_emux *emu)
strcpy(hw->name, SNDRV_EMUX_HWDEP_NAME);
hw->iface = SNDRV_HWDEP_IFACE_EMUX_WAVETABLE;
hw->ops.ioctl = snd_emux_hwdep_ioctl;
+ /* The ioctl parameter types are compatible between 32- and
+ * 64-bit architectures, so use the same function. */
+ hw->ops.ioctl_compat = snd_emux_hwdep_ioctl;
hw->exclusive = 1;
hw->private_data = emu;
if ((err = snd_card_register(emu->card)) < 0)