[PATCH 13/14] Big kfree NULL check cleanup - sound

[Jesper Juhl <jesper.juhl@gmail.com>]

This is the sound/ part of the big kfree cleanup patch.

Remove pointless checks for NULL prior to calling kfree() in sound/.


Sorry about the long Cc: list, but I wanted to make sure I included everyone
who's code I've changed with this patch.


Signed-off-by: Jesper Juhl <jesper.juhl@gmail.com>
---

Please see the initial announcement mail on LKML with subject
"[PATCH 00/14] Big kfree NULL check cleanup"
for additional details.

 sound/pci/ad1889.c        |    3 +--
 sound/pci/rme9652/hdspm.c |    3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

--- linux-2.6.14-rc4-orig/sound/pci/rme9652/hdspm.c	2005-10-11 22:41:41.000000000 +0200
+++ linux-2.6.14-rc4/sound/pci/rme9652/hdspm.c	2005-10-13 11:49:26.000000000 +0200
@@ -3563,8 +3563,7 @@ static int snd_hdspm_free(hdspm_t * hdsp
 		free_irq(hdspm->irq, (void *) hdspm);
 
 
-	if (hdspm->mixer)
-		kfree(hdspm->mixer);
+	kfree(hdspm->mixer);
 
 	if (hdspm->iobase)
 		iounmap(hdspm->iobase);
--- linux-2.6.14-rc4-orig/sound/pci/ad1889.c	2005-10-11 22:41:36.000000000 +0200
+++ linux-2.6.14-rc4/sound/pci/ad1889.c	2005-10-13 11:49:33.000000000 +0200
@@ -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;



-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/