summaryrefslogtreecommitdiff
path: root/sound/pci/ctxfi/ctsrc.c
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2017-09-04 11:10:27 +0300
committerTakashi Iwai <tiwai@suse.de>2017-09-04 11:10:27 +0300
commit2a32a4d9c9cc4141abdf8e90f0cd167a614c9e91 (patch)
tree1cd995a5f989c879d3d71566a1fa2db9745c5263 /sound/pci/ctxfi/ctsrc.c
parent1f7f51a63114bab3a05920f4b1343154e95e2cb6 (diff)
parent39cdc62b1b4efa39831d4de22f990043b0304fff (diff)
downloadlinux-2a32a4d9c9cc4141abdf8e90f0cd167a614c9e91.tar.xz
Merge branch 'for-next' into for-linus
Diffstat (limited to 'sound/pci/ctxfi/ctsrc.c')
-rw-r--r--sound/pci/ctxfi/ctsrc.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/sound/pci/ctxfi/ctsrc.c b/sound/pci/ctxfi/ctsrc.c
index a5a72df29801..bb4c9c3c89ae 100644
--- a/sound/pci/ctxfi/ctsrc.c
+++ b/sound/pci/ctxfi/ctsrc.c
@@ -702,10 +702,8 @@ error1:
static int srcimp_rsc_uninit(struct srcimp *srcimp)
{
- if (NULL != srcimp->imappers) {
- kfree(srcimp->imappers);
- srcimp->imappers = NULL;
- }
+ kfree(srcimp->imappers);
+ srcimp->imappers = NULL;
srcimp->ops = NULL;
srcimp->mgr = NULL;
rsc_uninit(&srcimp->rsc);