USB: option.c remove duplicate device ids now supported in hso.c

[safe/jmp/linux-2.6] / sound / usb / usbaudio.c

diff --git a/sound/usb/usbaudio.c b/sound/usb/usbaudio.c
index c5cf682..bbd70d5 100644 (file)
--- a/sound/usb/usbaudio.c
+++ b/sound/usb/usbaudio.c
@@ -484,7 +484,7 @@ static int retire_playback_sync_urb_hs(struct snd_usb_substream *subs,
 }
 
 /*
- * process after E-Mu 0202/0404 high speed playback sync complete
+ * process after E-Mu 0202/0404/Tracker Pre high speed playback sync complete
  *
  * These devices return the number of samples per packet instead of the number
  * of samples per microframe.
@@ -2264,6 +2264,7 @@ static void init_substream(struct snd_usb_stream *as, int stream, struct audiofo
                switch (as->chip->usb_id) {
                case USB_ID(0x041e, 0x3f02): /* E-Mu 0202 USB */
                case USB_ID(0x041e, 0x3f04): /* E-Mu 0404 USB */
+               case USB_ID(0x041e, 0x3f0a): /* E-Mu Tracker Pre */
                        subs->ops.retire_sync = retire_playback_sync_urb_hs_emu;
                        break;
                }
@@ -2996,12 +2997,12 @@ static int create_standard_audio_quirk(struct snd_usb_audio *chip,
 }
 
 /*
- * Create a stream for an Edirol UA-700/UA-25 interface.  The only way
- * to detect the sample rate is by looking at wMaxPacketSize.
+ * Create a stream for an Edirol UA-700/UA-25/UA-4FX interface.  
+ * The only way to detect the sample rate is by looking at wMaxPacketSize.
  */
-static int create_ua700_ua25_quirk(struct snd_usb_audio *chip,
-                                  struct usb_interface *iface,
-                                  const struct snd_usb_audio_quirk *quirk)
+static int create_uaxx_quirk(struct snd_usb_audio *chip,
+                             struct usb_interface *iface,
+                             const struct snd_usb_audio_quirk *quirk)
 {
        static const struct audioformat ua_format = {
                .format = SNDRV_PCM_FORMAT_S24_3LE,
@@ -3016,8 +3017,8 @@ static int create_ua700_ua25_quirk(struct snd_usb_audio *chip,
        struct audioformat *fp;
        int stream, err;
 
-       /* both PCM and MIDI interfaces have 2 altsettings */
-       if (iface->num_altsetting != 2)
+       /* both PCM and MIDI interfaces have 2 or more altsettings */
+       if (iface->num_altsetting < 2)
                return -ENXIO;
        alts = &iface->altsetting[1];
        altsd = get_iface_desc(alts);
@@ -3031,20 +3032,20 @@ static int create_ua700_ua25_quirk(struct snd_usb_audio *chip,
                        .type = QUIRK_MIDI_FIXED_ENDPOINT,
                        .data = &ua700_ep
                };
-               static const struct snd_usb_midi_endpoint_info ua25_ep = {
+               static const struct snd_usb_midi_endpoint_info uaxx_ep = {
                        .out_cables = 0x0001,
                        .in_cables  = 0x0001
                };
-               static const struct snd_usb_audio_quirk ua25_quirk = {
+               static const struct snd_usb_audio_quirk uaxx_quirk = {
                        .type = QUIRK_MIDI_FIXED_ENDPOINT,
-                       .data = &ua25_ep
+                       .data = &uaxx_ep
                };
                if (chip->usb_id == USB_ID(0x0582, 0x002b))
                        return snd_usb_create_midi_interface(chip, iface,
                                                             &ua700_quirk);
                else
                        return snd_usb_create_midi_interface(chip, iface,
-                                                            &ua25_quirk);
+                                                            &uaxx_quirk);
        }
 
        if (altsd->bNumEndpoints != 1)
@@ -3376,9 +3377,9 @@ static int snd_usb_create_quirk(struct snd_usb_audio *chip,
                [QUIRK_MIDI_CME] = snd_usb_create_midi_interface,
                [QUIRK_AUDIO_STANDARD_INTERFACE] = create_standard_audio_quirk,
                [QUIRK_AUDIO_FIXED_ENDPOINT] = create_fixed_stream_quirk,
-               [QUIRK_AUDIO_EDIROL_UA700_UA25] = create_ua700_ua25_quirk,
                [QUIRK_AUDIO_EDIROL_UA1000] = create_ua1000_quirk,
                [QUIRK_AUDIO_EDIROL_UA101] = create_ua101_quirk,
+               [QUIRK_AUDIO_EDIROL_UAXX] = create_uaxx_quirk
        };
 
        if (quirk->type < QUIRK_TYPE_COUNT) {