[alsa-devel] [PATCH 23/26] ALSA: riptide: remove redundant NULL test before release_firmware()
release_firmware() deals gracefully with NULL pointers, no need to check first.
Signed-off-by: Jesper Juhl jj@chaosbits.net --- sound/pci/riptide/riptide.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/sound/pci/riptide/riptide.c b/sound/pci/riptide/riptide.c index 0481d94..cbeb3f7 100644 --- a/sound/pci/riptide/riptide.c +++ b/sound/pci/riptide/riptide.c @@ -1837,8 +1837,7 @@ static int snd_riptide_free(struct snd_riptide *chip) } if (chip->irq >= 0) free_irq(chip->irq, chip); - if (chip->fw_entry) - release_firmware(chip->fw_entry); + release_firmware(chip->fw_entry); release_and_free_resource(chip->res_port); kfree(chip); return 0;
At Mon, 9 Apr 2012 22:52:10 +0200 (CEST), Jesper Juhl wrote:
release_firmware() deals gracefully with NULL pointers, no need to check first.
Signed-off-by: Jesper Juhl jj@chaosbits.net
Applied now. Thanks.
Takashi
sound/pci/riptide/riptide.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/sound/pci/riptide/riptide.c b/sound/pci/riptide/riptide.c index 0481d94..cbeb3f7 100644 --- a/sound/pci/riptide/riptide.c +++ b/sound/pci/riptide/riptide.c @@ -1837,8 +1837,7 @@ static int snd_riptide_free(struct snd_riptide *chip) } if (chip->irq >= 0) free_irq(chip->irq, chip);
- if (chip->fw_entry)
release_firmware(chip->fw_entry);
- release_firmware(chip->fw_entry); release_and_free_resource(chip->res_port); kfree(chip); return 0;
-- 1.7.10
-- Jesper Juhl jj@chaosbits.net http://www.chaosbits.net/ Don't top-post http://www.catb.org/jargon/html/T/top-post.html Plain text mails only, please.
participants (2)
-
Jesper Juhl -
Takashi Iwai