Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

[mv-sheeva.git] / sound / usb / format.c

diff --git a/sound/usb/format.c b/sound/usb/format.c
index 30364aba79ccb0e8bef307ccbe166d28799d7464..4387f54d73db2c65fb04fbcdf031d4c19aa91dab 100644 (file)
--- a/sound/usb/format.c
+++ b/sound/usb/format.c
@@ -264,13 +264,12 @@ static int parse_uac2_sample_rate_range(struct audioformat *fp, int nr_triplets,
  * on the audioformat table (audio class v2).
  */
 static int parse_audio_format_rates_v2(struct snd_usb_audio *chip,
-                                      struct audioformat *fp,
-                                      struct usb_host_interface *iface)
+                                      struct audioformat *fp)
 {
        struct usb_device *dev = chip->dev;
        unsigned char tmp[2], *data;
        int nr_triplets, data_size, ret = 0;
-       int clock = snd_usb_clock_find_source(chip, chip->ctrl_intf, fp->clock);
+       int clock = snd_usb_clock_find_source(chip, fp->clock);
 
        if (clock < 0) {
                snd_printk(KERN_ERR "%s(): unable to find clock source (clock %d)\n",
@@ -391,7 +390,7 @@ static int parse_audio_format_i(struct snd_usb_audio *chip,
                break;
        case UAC_VERSION_2:
                /* fp->channels is already set in this case */
-               ret = parse_audio_format_rates_v2(chip, fp, iface);
+               ret = parse_audio_format_rates_v2(chip, fp);
                break;
        }
 
@@ -450,7 +449,7 @@ static int parse_audio_format_ii(struct snd_usb_audio *chip,
                framesize = le16_to_cpu(fmt->wSamplesPerFrame);
                snd_printd(KERN_INFO "found format II with max.bitrate = %d, frame size=%d\n", brate, framesize);
                fp->frame_size = framesize;
-               ret = parse_audio_format_rates_v2(chip, fp, iface);
+               ret = parse_audio_format_rates_v2(chip, fp);
                break;
        }
        }