summaryrefslogtreecommitdiffstats
path: root/sound/pci
diff options
context:
space:
mode:
authorMarkus Elfring <elfring@users.sourceforge.net>2014-12-02 18:52:21 +0100
committerTakashi Iwai <tiwai@suse.de>2014-12-02 20:10:42 +0100
commit5c34fdf48b9522ca87372b1fae19de8f93ffd130 (patch)
tree2027b943c2029e5dd31a133a8c6eb6bd300264b8 /sound/pci
parent057a4a55e703038d22bc9f2bcf8b02dc35850e16 (diff)
downloadblackbird-op-linux-5c34fdf48b9522ca87372b1fae19de8f93ffd130.tar.gz
blackbird-op-linux-5c34fdf48b9522ca87372b1fae19de8f93ffd130.zip
ALSA: trident: Deletion of a check before snd_util_memhdr_free()
The snd_util_memhdr_free() function tests whether its argument is NULL and then returns immediately. Thus the test around the call is not needed. This issue was detected by using the Coccinelle software. Signed-off-by: Markus Elfring <elfring@users.sourceforge.net> Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci')
-rw-r--r--sound/pci/trident/trident_main.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/sound/pci/trident/trident_main.c b/sound/pci/trident/trident_main.c
index da875dced2ef..57cd757acfe7 100644
--- a/sound/pci/trident/trident_main.c
+++ b/sound/pci/trident/trident_main.c
@@ -3702,8 +3702,7 @@ static int snd_trident_free(struct snd_trident *trident)
free_irq(trident->irq, trident);
if (trident->tlb.buffer.area) {
outl(0, TRID_REG(trident, NX_TLBC));
- if (trident->tlb.memhdr)
- snd_util_memhdr_free(trident->tlb.memhdr);
+ snd_util_memhdr_free(trident->tlb.memhdr);
if (trident->tlb.silent_page.area)
snd_dma_free_pages(&trident->tlb.silent_page);
vfree(trident->tlb.shadow_entries);
OpenPOWER on IntegriCloud