Merge branch 'for-3.19' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu

[cascardo/linux.git] / sound / usb / pcm.c

diff --git a/sound/usb/pcm.c b/sound/usb/pcm.c
index c62a165..0d8aba5 100644 (file)
--- a/sound/usb/pcm.c
+++ b/sound/usb/pcm.c
@@ -482,6 +482,11 @@ static int set_format(struct snd_usb_substream *subs, struct audioformat *fmt)
        /* set interface */
        if (subs->interface != fmt->iface ||
            subs->altset_idx != fmt->altset_idx) {
+
+               err = snd_usb_select_mode_quirk(subs, fmt);
+               if (err < 0)
+                       return -EIO;
+
                err = usb_set_interface(dev, fmt->iface, fmt->altsetting);
                if (err < 0) {
                        dev_err(&dev->dev,