| Message ID | 547DFD4E.50207@users.sourceforge.net (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 5c34fdf48b9522ca87372b1fae19de8f93ffd130 |
| Headers | show |
At Tue, 02 Dec 2014 18:56:30 +0100, SF Markus Elfring wrote: > > From: Markus Elfring <elfring@users.sourceforge.net> > Date: Tue, 2 Dec 2014 18:52:21 +0100 > > 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> Applied, thanks. Takashi > --- > sound/pci/trident/trident_main.c | 3 +-- > 1 file changed, 1 insertion(+), 2 deletions(-) > > diff --git a/sound/pci/trident/trident_main.c b/sound/pci/trident/trident_main.c > index da875dc..57cd757 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); > -- > 2.1.3 >
diff --git a/sound/pci/trident/trident_main.c b/sound/pci/trident/trident_main.c index da875dc..57cd757 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);