Commit c6297493 authored by Jaroslav Kysela's avatar Jaroslav Kysela Committed by Linus Torvalds

ALSA CVS update - Clemens Ladisch <clemens@ladisch.de>

USB generic driver
adjust usb_set_interface() calls for 2.6.5-rc2
parent 3090c355
...@@ -1223,7 +1223,7 @@ static int set_format(snd_usb_substream_t *subs, struct audioformat *fmt) ...@@ -1223,7 +1223,7 @@ static int set_format(snd_usb_substream_t *subs, struct audioformat *fmt)
/* set interface */ /* set interface */
if (subs->interface != fmt->iface || subs->format != fmt->altset_idx) { if (subs->interface != fmt->iface || subs->format != fmt->altset_idx) {
if (usb_set_interface(dev, fmt->iface, fmt->altset_idx) < 0) { if (usb_set_interface(dev, fmt->iface, fmt->altsetting) < 0) {
snd_printk(KERN_ERR "%d:%d:%d: usb_set_interface failed\n", snd_printk(KERN_ERR "%d:%d:%d: usb_set_interface failed\n",
dev->devnum, fmt->iface, fmt->altsetting); dev->devnum, fmt->iface, fmt->altsetting);
return -EIO; return -EIO;
...@@ -2532,7 +2532,7 @@ static int parse_audio_endpoints(snd_usb_audio_t *chip, int iface_no) ...@@ -2532,7 +2532,7 @@ static int parse_audio_endpoints(snd_usb_audio_t *chip, int iface_no)
return err; return err;
} }
/* try to set the interface... */ /* try to set the interface... */
usb_set_interface(chip->dev, iface_no, i); usb_set_interface(chip->dev, iface_no, altno);
init_usb_pitch(chip->dev, iface_no, alts, fp); init_usb_pitch(chip->dev, iface_no, alts, fp);
init_usb_sample_rate(chip->dev, iface_no, alts, fp, fp->rate_max); init_usb_sample_rate(chip->dev, iface_no, alts, fp, fp->rate_max);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment