summaryrefslogtreecommitdiffstats
path: root/sound/pci
diff options
context:
space:
mode:
authorJesper Juhl <jj@chaosbits.net>2012-04-09 22:52:10 +0200
committerTakashi Iwai <tiwai@suse.de>2012-04-10 08:42:33 +0200
commit507230c9997ef47147818508108b97b3e189826f (patch)
tree7b791c19997104036a6318dc5c745b7b08e8ebf2 /sound/pci
parent38be95dd3d314bd393a26f6e441ae2c57ef7f064 (diff)
downloadlinux-stable-507230c9997ef47147818508108b97b3e189826f.tar.gz
linux-stable-507230c9997ef47147818508108b97b3e189826f.tar.bz2
linux-stable-507230c9997ef47147818508108b97b3e189826f.zip
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> Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci')
-rw-r--r--sound/pci/riptide/riptide.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/sound/pci/riptide/riptide.c b/sound/pci/riptide/riptide.c
index 0481d94aac9b..cbeb3f77350c 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;