From b6490afd7a7bf3fbf3adc4b98300ae6c16263dbe Mon Sep 17 00:00:00 2001 From: Richard Knutsson Date: Mon, 14 May 2007 10:38:57 +0200 Subject: [PATCH] --- yaml --- r: 62032 b: refs/heads/master c: c111b8de975a357ff58e73047e9af48afacf2347 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/sound/usb/usx2y/usbusx2yaudio.c | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index ec43a6f99c56..e1490d26ed5f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 500bec3d2ba4787e6ab110d159b2926093c27304 +refs/heads/master: c111b8de975a357ff58e73047e9af48afacf2347 diff --git a/trunk/sound/usb/usx2y/usbusx2yaudio.c b/trunk/sound/usb/usx2y/usbusx2yaudio.c index 0a352e46862f..48e9aa3f18c9 100644 --- a/trunk/sound/usb/usx2y/usbusx2yaudio.c +++ b/trunk/sound/usb/usx2y/usbusx2yaudio.c @@ -935,10 +935,9 @@ static struct snd_pcm_ops snd_usX2Y_pcm_ops = */ static void usX2Y_audio_stream_free(struct snd_usX2Y_substream **usX2Y_substream) { - if (NULL != usX2Y_substream[SNDRV_PCM_STREAM_PLAYBACK]) { - kfree(usX2Y_substream[SNDRV_PCM_STREAM_PLAYBACK]); - usX2Y_substream[SNDRV_PCM_STREAM_PLAYBACK] = NULL; - } + kfree(usX2Y_substream[SNDRV_PCM_STREAM_PLAYBACK]); + usX2Y_substream[SNDRV_PCM_STREAM_PLAYBACK] = NULL; + kfree(usX2Y_substream[SNDRV_PCM_STREAM_CAPTURE]); usX2Y_substream[SNDRV_PCM_STREAM_CAPTURE] = NULL; }