diff options
author | Jesper Juhl <jesper.juhl@gmail.com> | 2005-10-24 09:11:28 -0400 |
---|---|---|
committer | Jaroslav Kysela <perex@suse.cz> | 2005-11-04 07:19:55 -0500 |
commit | fc58422ad95a0f4936ead538e0b946aee5a4f98c (patch) | |
tree | 1b2318ac68b5704db165e175e88199969f2339dd /sound | |
parent | 8433a509c0eb6bb1f33ce39c82c580b8901619ee (diff) |
[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 d7d99a25c5e5..e72ccd1a004f 100644 --- a/sound/pci/ad1889.c +++ b/sound/pci/ad1889.c | |||
@@ -50,7 +50,7 @@ | |||
50 | #include "ad1889.h" | 50 | #include "ad1889.h" |
51 | #include "ac97/ac97_id.h" | 51 | #include "ac97/ac97_id.h" |
52 | 52 | ||
53 | #define AD1889_DRVVER "$Revision: 1.3 $" | 53 | #define AD1889_DRVVER "$Revision: 1.4 $" |
54 | 54 | ||
55 | MODULE_AUTHOR("Kyle McMartin <kyle@parisc-linux.org>, Thibaut Varene <t-bone@parisc-linux.org>"); | 55 | MODULE_AUTHOR("Kyle McMartin <kyle@parisc-linux.org>, Thibaut Varene <t-bone@parisc-linux.org>"); |
56 | MODULE_DESCRIPTION("Analog Devices AD1889 ALSA sound driver"); | 56 | MODULE_DESCRIPTION("Analog Devices AD1889 ALSA sound driver"); |
@@ -982,8 +982,7 @@ snd_ad1889_create(snd_card_t *card, | |||
982 | return 0; | 982 | return 0; |
983 | 983 | ||
984 | free_and_ret: | 984 | free_and_ret: |
985 | if (chip) | 985 | kfree(chip); |
986 | kfree(chip); | ||
987 | pci_disable_device(pci); | 986 | pci_disable_device(pci); |
988 | 987 | ||
989 | return err; | 988 | return err; |
diff --git a/sound/pci/rme9652/hdspm.c b/sound/pci/rme9652/hdspm.c index fc3f3283ff37..60a1141f1327 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) | |||
3563 | free_irq(hdspm->irq, (void *) hdspm); | 3563 | free_irq(hdspm->irq, (void *) hdspm); |
3564 | 3564 | ||
3565 | 3565 | ||
3566 | if (hdspm->mixer) | 3566 | kfree(hdspm->mixer); |
3567 | kfree(hdspm->mixer); | ||
3568 | 3567 | ||
3569 | if (hdspm->iobase) | 3568 | if (hdspm->iobase) |
3570 | iounmap(hdspm->iobase); | 3569 | iounmap(hdspm->iobase); |