| commit | ce174dd8879d07bac1c6e39c72d904a93cde5f2c | [log] [tgz] |
|---|---|---|
| author | Linux Build Service Account <lnxbuild@localhost> | Mon Feb 25 00:18:36 2013 -0800 |
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | Mon Feb 25 00:18:36 2013 -0800 |
| tree | b377273b90a97de8f88efccf4147298fc17b872c | |
| parent | 5cd964988bb64e870de46b26f3d0d0ff16d78ca3 [diff] | |
| parent | 197d2d10771ce36f2fbc225b11aa30df4125d745 [diff] |
Merge "ASoC: usb: move the switch setting to more appropriate location"
diff --git a/sound/usb/card.c b/sound/usb/card.c index deeb5c7..f453dbd 100644 --- a/sound/usb/card.c +++ b/sound/usb/card.c
@@ -265,7 +265,7 @@ break; } } - + switch_set_state(usbaudiosdev, 1); return 0; } @@ -421,7 +421,6 @@ } snd_usb_audio_create_proc(chip); - switch_set_state(usbaudiosdev, 1); *rchip = chip; return 0;