diff options
author | Jesper Juhl <juhl-lkml@dif.dk> | 2005-05-30 11:30:32 -0400 |
---|---|---|
committer | Jaroslav Kysela <perex@suse.cz> | 2005-06-22 06:27:43 -0400 |
commit | 4d572776d4dfa2d5385a2ec3acec3cc059149e13 (patch) | |
tree | b25ff1baa8d106561d9f07045bbfea6ac330c714 /sound/drivers/vx | |
parent | 6fd8b87f0e1e5de436ba020bd5806fe9ad738269 (diff) |
[ALSA] Remove redundant NULL checks before kfree
Timer Midlevel,ALSA sequencer,ALSA<-OSS sequencer,Digigram VX core
I2C tea6330t,GUS Library,VIA82xx driver,VIA82xx-modem driver
CA0106 driver,CS46xx driver,EMU10K1/EMU10K2 driver,YMFPCI driver
Digigram VX Pocket driver,Common EMU synth,USB generic driver,USB USX2Y
Checking a pointer for NULL before calling kfree() on it is redundant,
kfree() deals with NULL pointers just fine.
This patch removes such checks from sound/
This patch also makes another, but closely related, change.
It avoids casting pointers about to be kfree()'ed.
Signed-off-by: Jesper Juhl <juhl-lkml@dif.dk>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/drivers/vx')
-rw-r--r-- | sound/drivers/vx/vx_pcm.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/sound/drivers/vx/vx_pcm.c b/sound/drivers/vx/vx_pcm.c index 98587176b327..af381b15fe5c 100644 --- a/sound/drivers/vx/vx_pcm.c +++ b/sound/drivers/vx/vx_pcm.c | |||
@@ -1264,14 +1264,10 @@ static void snd_vx_pcm_free(snd_pcm_t *pcm) | |||
1264 | { | 1264 | { |
1265 | vx_core_t *chip = pcm->private_data; | 1265 | vx_core_t *chip = pcm->private_data; |
1266 | chip->pcm[pcm->device] = NULL; | 1266 | chip->pcm[pcm->device] = NULL; |
1267 | if (chip->playback_pipes) { | 1267 | kfree(chip->playback_pipes); |
1268 | kfree(chip->playback_pipes); | 1268 | chip->playback_pipes = NULL; |
1269 | chip->playback_pipes = NULL; | 1269 | kfree(chip->capture_pipes); |
1270 | } | 1270 | chip->capture_pipes = NULL; |
1271 | if (chip->capture_pipes) { | ||
1272 | kfree(chip->capture_pipes); | ||
1273 | chip->capture_pipes = NULL; | ||
1274 | } | ||
1275 | } | 1271 | } |
1276 | 1272 | ||
1277 | /* | 1273 | /* |