diff options
| author | Jesper Juhl <juhl-lkml@dif.dk> | 2005-05-30 17:30:32 +0200 |
|---|---|---|
| committer | Jaroslav Kysela <perex@suse.cz> | 2005-06-22 12:27:43 +0200 |
| commit | 4d572776d4dfa2d5385a2ec3acec3cc059149e13 (patch) | |
| tree | b25ff1baa8d106561d9f07045bbfea6ac330c714 /sound/core/timer.c | |
| parent | [ALSA] AC97 - renamed vendor/device to subvendor/subdevice where appropriate (diff) | |
| download | linux-4d572776d4dfa2d5385a2ec3acec3cc059149e13.tar.xz linux-4d572776d4dfa2d5385a2ec3acec3cc059149e13.zip | |
[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/core/timer.c')
| -rw-r--r-- | sound/core/timer.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/sound/core/timer.c b/sound/core/timer.c index d67a5e91a108..b498e5482d77 100644 --- a/sound/core/timer.c +++ b/sound/core/timer.c @@ -1469,14 +1469,10 @@ static int snd_timer_user_tselect(struct file *file, snd_timer_select_t __user * if ((err = snd_timer_open(&tu->timeri, str, &tselect.id, current->pid)) < 0) goto __err; - if (tu->queue) { - kfree(tu->queue); - tu->queue = NULL; - } - if (tu->tqueue) { - kfree(tu->tqueue); - tu->tqueue = NULL; - } + kfree(tu->queue); + tu->queue = NULL; + kfree(tu->tqueue); + tu->tqueue = NULL; if (tu->tread) { tu->tqueue = (snd_timer_tread_t *)kmalloc(tu->queue_size * sizeof(snd_timer_tread_t), GFP_KERNEL); if (tu->tqueue == NULL) |