[kernel] r16270 - in dists/sid/linux-2.6/debian: . patches/bugfix/all patches/series

[Ben Hutchings]

Author: benh
Date: Sun Sep 12 22:14:10 2010
New Revision: 16270

Log:
ALSA: emux: Add trivial compat ioctl handler (Closes: #596478)

Added:
   dists/sid/linux-2.6/debian/patches/bugfix/all/ALSA-emux-Add-trivial-compat-ioctl-handler.patch
Modified:
   dists/sid/linux-2.6/debian/changelog
   dists/sid/linux-2.6/debian/patches/series/22

Modified: dists/sid/linux-2.6/debian/changelog
==============================================================================
--- dists/sid/linux-2.6/debian/changelog	Sun Sep 12 17:17:58 2010	(r16269)
+++ dists/sid/linux-2.6/debian/changelog	Sun Sep 12 22:14:10 2010	(r16270)
@@ -53,6 +53,7 @@
   * [x86] HPET: unmap unused I/O space
   * ipheth: add support for iPhone 4
   * ipheth: remove incorrect devtype of WWAN
+  * ALSA: emux: Add trivial compat ioctl handler (Closes: #596478)
 
   [ Bastian Blank ]
   * Use Breaks instead of Conflicts.

Added: dists/sid/linux-2.6/debian/patches/bugfix/all/ALSA-emux-Add-trivial-compat-ioctl-handler.patch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/sid/linux-2.6/debian/patches/bugfix/all/ALSA-emux-Add-trivial-compat-ioctl-handler.patch	Sun Sep 12 22:14:10 2010	(r16270)
@@ -0,0 +1,27 @@
+Subject: [PATCH] ALSA: emux: Add trivial compat ioctl handler
+From: Ben Hutchings <ben at decadent.org.uk>
+Date: Sun, 12 Sep 2010 02:41:47 +0100
+
+Reported-by: Carmen Cru <carmen.cru at belgacom.net>
+Signed-off-by: Ben Hutchings <ben at decadent.org.uk>
+---
+ sound/synth/emux/emux_hwdep.c |    3 +++
+ 1 files changed, 3 insertions(+), 0 deletions(-)
+
+diff --git a/sound/synth/emux/emux_hwdep.c b/sound/synth/emux/emux_hwdep.c
+index ff0b2a8..5ae1eae 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)
+-- 
+1.7.1
+

Modified: dists/sid/linux-2.6/debian/patches/series/22
==============================================================================
--- dists/sid/linux-2.6/debian/patches/series/22	Sun Sep 12 17:17:58 2010	(r16269)
+++ dists/sid/linux-2.6/debian/patches/series/22	Sun Sep 12 22:14:10 2010	(r16270)
@@ -123,3 +123,4 @@
 + bugfix/x86/HPET-unmap-unused-I-O-space.patch
 + features/all/ipheth-add-support-for-iPhone-4.patch
 + bugfix/all/ipheth-remove-incorrect-devtype-to-WWAN.patch
++ bugfix/all/ALSA-emux-Add-trivial-compat-ioctl-handler.patch