diff options
| author | Jesper Juhl <juhl-lkml@dif.dk> | 2005-05-30 19:30:32 +0400 |
|---|---|---|
| committer | Jaroslav Kysela <perex@suse.cz> | 2005-06-22 14:27:43 +0400 |
| commit | 4d572776d4dfa2d5385a2ec3acec3cc059149e13 (patch) | |
| tree | b25ff1baa8d106561d9f07045bbfea6ac330c714 /sound/usb/usbmixer.c | |
| parent | 6fd8b87f0e1e5de436ba020bd5806fe9ad738269 (diff) | |
| download | linux-4d572776d4dfa2d5385a2ec3acec3cc059149e13.tar.xz | |
[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/usb/usbmixer.c')
| -rw-r--r-- | sound/usb/usbmixer.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/sound/usb/usbmixer.c b/sound/usb/usbmixer.c index 83ba665e5c6e..e73c1c9d3e73 100644 --- a/sound/usb/usbmixer.c +++ b/sound/usb/usbmixer.c @@ -623,10 +623,8 @@ static struct usb_feature_control_info audio_feature_info[] = { /* private_free callback */ static void usb_mixer_elem_free(snd_kcontrol_t *kctl) { - if (kctl->private_data) { - kfree(kctl->private_data); - kctl->private_data = NULL; - } + kfree(kctl->private_data); + kctl->private_data = NULL; } |