Merge git://git.kernel.org/pub/scm/linux/kernel/git/perex/alsa

* git://git.kernel.org/pub/scm/linux/kernel/git/perex/alsa: (124 commits)
  [ALSA] version 1.0.11rc4
  [PATCH] Intruduce DMA_28BIT_MASK
  [ALSA] hda-codec - Add support for ASUS P4GPL-X
  [ALSA] hda-codec - Add support for HP nx9420 laptop
  [ALSA] Fix memory leaks in error path of control.c
  [ALSA] AMD Au1x00: AC'97 controller is memory mapped
  [ALSA] AMD Au1x00: fix DMA init/cleanup
  [ALSA] hda-codec - Fix generic auto-configurator
  [ALSA] hda-codec - Fix BIOS auto-configuration
  [ALSA] Fixes typos in Audiophile-USB.txt
  [ALSA] ice1712 - typo fixes for dxr_enable module option
  [ALSA] AMD Au1x00: make driver build after cleanup
  [ALSA] ice1712 - Fix wrong value types for enum items
  [ALSA] fix resource leak in usbmixer
  [ALSA] Fix gus_pcm dereference before NULL
  [ALSA] Fix seq_clientmgr dereferences before NULL check
  [ALSA] hda-codec - Fix for Samsung R65 and ASUS A6J
  [ALSA] hda-codec - Add support for VAIO FE550G and SZ110
  [ALSA] usb-audio: add Maya44 mixer control names
  [ALSA] usb-audio: add Casio PL-40R support
  ...

1 files changed, 6 insertions, 4 deletions

diff --git a/sound/usb/usbmidi.c b/sound/usb/usbmidi.c
index f15b021c3ce8..2b9d940c8064 100644
--- a/sound/usb/usbmidi.c
+++ b/sound/usb/usbmidi.c
@@ -871,10 +871,10 @@ static int snd_usbmidi_in_endpoint_create(struct snd_usb_midi* umidi,
 
 static unsigned int snd_usbmidi_count_bits(unsigned int x)
 {
-        unsigned int bits = 0;
+        unsigned int bits;
 
-        for (; x; x >>= 1)
-                bits += x & 1;
+        for (bits = 0; x; ++bits)
+                x &= x - 1;
         return bits;
 }
 
@@ -1082,6 +1082,8 @@ static struct {
         { USB_ID(0x0582, 0x004d), 0, "%s MIDI" },
         { USB_ID(0x0582, 0x004d), 1, "%s 1" },
         { USB_ID(0x0582, 0x004d), 2, "%s 2" },
+        /* Edirol UM-3EX */
+        { USB_ID(0x0582, 0x009a), 3, "%s Control" },
         /* M-Audio MidiSport 8x8 */
         { USB_ID(0x0763, 0x1031), 8, "%s Control" },
         { USB_ID(0x0763, 0x1033), 8, "%s Control" },
@@ -1574,7 +1576,7 @@ int snd_usb_create_midi_interface(struct snd_usb_audio* chip,
                        sizeof(struct snd_usb_midi_endpoint_info));
                 err = snd_usbmidi_detect_endpoints(umidi, &endpoints[0], 1);
                 break;
-        case QUIRK_MIDI_MIDITECH:
+        case QUIRK_MIDI_CME:
                 err = snd_usbmidi_detect_per_port_endpoints(umidi, endpoints);
                 break;
         default: