aboutsummaryrefslogtreecommitdiffstats
path: root/sound/usb
diff options
context:
space:
mode:
authorRichard Knutsson <ricknu-0@student.ltu.se>2007-05-14 10:38:57 +0200
committerJaroslav Kysela <perex@suse.cz>2007-07-20 11:11:14 +0200
commitc111b8de975a357ff58e73047e9af48afacf2347 (patch)
treea0332849bf8c3ad7df2bc73859b06265c888e1b2 /sound/usb
parent500bec3d2ba4787e6ab110d159b2926093c27304 (diff)
downloadkernel_samsung_crespo-c111b8de975a357ff58e73047e9af48afacf2347.zip
kernel_samsung_crespo-c111b8de975a357ff58e73047e9af48afacf2347.tar.gz
kernel_samsung_crespo-c111b8de975a357ff58e73047e9af48afacf2347.tar.bz2
[ALSA] usbusx2yaudio: kfree(NULL) is valid
if (!x) kfree(x); is not needed since kfree(NULL) is valid. Signed-off-by: Richard Knutsson <ricknu-0@student.ltu.se> Signed-off-by: Takashi Iwai <tiwai@suse.de> Signed-off-by: Jaroslav Kysela <perex@suse.cz>
Diffstat (limited to 'sound/usb')
-rw-r--r--sound/usb/usx2y/usbusx2yaudio.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/sound/usb/usx2y/usbusx2yaudio.c b/sound/usb/usx2y/usbusx2yaudio.c
index 0a352e4..48e9aa3 100644
--- a/sound/usb/usx2y/usbusx2yaudio.c
+++ b/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;
}