diff options
author | Takashi Iwai <tiwai@suse.de> | 2010-02-17 08:24:46 -0500 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2010-02-17 08:24:46 -0500 |
commit | 7fb3a069bc5d3577409c2ae89f89cd264ff85816 (patch) | |
tree | 7fe3ba3b95faeecb01e4feafb9288ef4b523c6b3 /sound/usb | |
parent | 291186e049d7f8178ad31d43c38a53889f25d79e (diff) | |
parent | 9d3415a8cc76ff65c6602a121ac318432c5cd7ba (diff) |
Merge branch 'fix/misc' into topic/misc
Conflicts:
sound/pci/hda/patch_realtek.c
Diffstat (limited to 'sound/usb')
-rw-r--r-- | sound/usb/usbaudio.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/usb/usbaudio.c b/sound/usb/usbaudio.c index 8a8f62515b80..c6b9c8cac59e 100644 --- a/sound/usb/usbaudio.c +++ b/sound/usb/usbaudio.c | |||
@@ -1959,7 +1959,7 @@ static int snd_usb_pcm_close(struct snd_pcm_substream *substream, int direction) | |||
1959 | struct snd_usb_stream *as = snd_pcm_substream_chip(substream); | 1959 | struct snd_usb_stream *as = snd_pcm_substream_chip(substream); |
1960 | struct snd_usb_substream *subs = &as->substream[direction]; | 1960 | struct snd_usb_substream *subs = &as->substream[direction]; |
1961 | 1961 | ||
1962 | if (subs->interface >= 0) { | 1962 | if (!as->chip->shutdown && subs->interface >= 0) { |
1963 | usb_set_interface(subs->dev, subs->interface, 0); | 1963 | usb_set_interface(subs->dev, subs->interface, 0); |
1964 | subs->interface = -1; | 1964 | subs->interface = -1; |
1965 | } | 1965 | } |