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/pcmcia/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/pcmcia/vx')
-rw-r--r-- | sound/pcmcia/vx/vx_entry.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sound/pcmcia/vx/vx_entry.c b/sound/pcmcia/vx/vx_entry.c index 53d8172c52ae..332bbca3dfc4 100644 --- a/sound/pcmcia/vx/vx_entry.c +++ b/sound/pcmcia/vx/vx_entry.c | |||
@@ -68,8 +68,7 @@ static int snd_vxpocket_free(vx_core_t *chip) | |||
68 | if (hw) | 68 | if (hw) |
69 | hw->card_list[vxp->index] = NULL; | 69 | hw->card_list[vxp->index] = NULL; |
70 | chip->card = NULL; | 70 | chip->card = NULL; |
71 | if (chip->dev) | 71 | kfree(chip->dev); |
72 | kfree(chip->dev); | ||
73 | 72 | ||
74 | snd_vx_free_firmware(chip); | 73 | snd_vx_free_firmware(chip); |
75 | kfree(chip); | 74 | kfree(chip); |