diff options
| author | Jesper Juhl <jesper.juhl@gmail.com> | 2005-10-24 15:11:28 +0200 |
|---|---|---|
| committer | Jaroslav Kysela <perex@suse.cz> | 2005-11-04 13:19:55 +0100 |
| commit | fc58422ad95a0f4936ead538e0b946aee5a4f98c (patch) | |
| tree | 1b2318ac68b5704db165e175e88199969f2339dd /sound | |
| parent | 8433a509c0eb6bb1f33ce39c82c580b8901619ee (diff) | |
| download | linux-3.10-fc58422ad95a0f4936ead538e0b946aee5a4f98c.tar.gz linux-3.10-fc58422ad95a0f4936ead538e0b946aee5a4f98c.tar.bz2 linux-3.10-fc58422ad95a0f4936ead538e0b946aee5a4f98c.zip | |
[ALSA] Big kfree NULL check cleanup - sound
Modules: AD1889 driver,RME9652 driver
This is the sound/ part of the big kfree cleanup patch.
Remove pointless checks for NULL prior to calling kfree() in sound/.
Signed-off-by: Jesper Juhl <jesper.juhl@gmail.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/pci/ad1889.c | 5 | ||||
| -rw-r--r-- | sound/pci/rme9652/hdspm.c | 3 |
2 files changed, 3 insertions, 5 deletions
diff --git a/sound/pci/ad1889.c b/sound/pci/ad1889.c index d7d99a25c5e..e72ccd1a004 100644 --- a/sound/pci/ad1889.c +++ b/sound/pci/ad1889.c @@ -50,7 +50,7 @@ #include "ad1889.h" #include "ac97/ac97_id.h" -#define AD1889_DRVVER "$Revision: 1.3 $" +#define AD1889_DRVVER "$Revision: 1.4 $" MODULE_AUTHOR("Kyle McMartin <kyle@parisc-linux.org>, Thibaut Varene <t-bone@parisc-linux.org>"); MODULE_DESCRIPTION("Analog Devices AD1889 ALSA sound driver"); @@ -982,8 +982,7 @@ snd_ad1889_create(snd_card_t *card, return 0; free_and_ret: - if (chip) - kfree(chip); + kfree(chip); pci_disable_device(pci); return err; diff --git a/sound/pci/rme9652/hdspm.c b/sound/pci/rme9652/hdspm.c index fc3f3283ff3..60a1141f132 100644 --- a/sound/pci/rme9652/hdspm.c +++ b/sound/pci/rme9652/hdspm.c @@ -3563,8 +3563,7 @@ static int snd_hdspm_free(hdspm_t * hdspm) free_irq(hdspm->irq, (void *) hdspm); - if (hdspm->mixer) - kfree(hdspm->mixer); + kfree(hdspm->mixer); if (hdspm->iobase) iounmap(hdspm->iobase); |