diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-02-06 08:25:13 -0500 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-02-06 08:25:13 -0500 |
| commit | b0050cae2ba48cb79fa22b0edd97e611abbd6a33 (patch) | |
| tree | 6a85edcdd2332a14eb0314d7a4d1a7da95b552fe /sound | |
| parent | b2573eb586169dfb02772856a4e7cb760f21ec12 (diff) | |
| parent | 894dcd78782842924527598b0b764c9b4e679e21 (diff) | |
Merge branch 'fix/usb-audio' into for-linus
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/usb/usbaudio.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sound/usb/usbaudio.c b/sound/usb/usbaudio.c index c709b9563226..2ab83129d9b0 100644 --- a/sound/usb/usbaudio.c +++ b/sound/usb/usbaudio.c | |||
| @@ -2966,6 +2966,7 @@ static int create_fixed_stream_quirk(struct snd_usb_audio *chip, | |||
| 2966 | return -EINVAL; | 2966 | return -EINVAL; |
| 2967 | } | 2967 | } |
| 2968 | alts = &iface->altsetting[fp->altset_idx]; | 2968 | alts = &iface->altsetting[fp->altset_idx]; |
| 2969 | fp->maxpacksize = le16_to_cpu(get_endpoint(alts, 0)->wMaxPacketSize); | ||
| 2969 | usb_set_interface(chip->dev, fp->iface, 0); | 2970 | usb_set_interface(chip->dev, fp->iface, 0); |
| 2970 | init_usb_pitch(chip->dev, fp->iface, alts, fp); | 2971 | init_usb_pitch(chip->dev, fp->iface, alts, fp); |
| 2971 | init_usb_sample_rate(chip->dev, fp->iface, alts, fp, fp->rate_max); | 2972 | init_usb_sample_rate(chip->dev, fp->iface, alts, fp, fp->rate_max); |