Merge https://github.com/PeterHuewe/linux-tpmdd into for-linus

[mirror_ubuntu-artful-kernel.git] / sound / oss / trix.c

diff --git a/sound/oss/trix.c b/sound/oss/trix.c
index 944e0c0154853d8fb31fe4cfa3fbf1b963a3137e..3c494dc93b936d4680aca2a70ccee94d1fba7938 100644 (file)
--- a/sound/oss/trix.c
+++ b/sound/oss/trix.c
@@ -487,7 +487,7 @@ static int __init init_trix(void)
 
 static void __exit cleanup_trix(void)
 {
-       if (fw_load && trix_boot)
+       if (fw_load)
                vfree(trix_boot);
        if (sb)
                unload_trix_sb(&cfg2);