Merge "usb: gadget: f_fs: Fix memory leak for ipc_log_context" into msm-4.9 (f1ca7e32) · Commits · e / devices / android_kernel_fairphone_FP3

drivers/usb/gadget/function/f_fs.c

+7 −0

Original line number	Diff line number	Diff line
		@@ -1761,6 +1761,8 @@ static int functionfs_init(void)
		pr_err("failed registering file system (%d)\n", ret);

		ffs_ipc_log = ipc_log_context_create(NUM_PAGES, "f_fs", 0);
		if (IS_ERR_OR_NULL(ffs_ipc_log))
		ffs_ipc_log = NULL;

		return ret;
		}
		@@ -1771,6 +1773,11 @@ static void functionfs_cleanup(void)

		pr_info("unloading\n");
		unregister_filesystem(&ffs_fs_type);

		if (ffs_ipc_log) {
		ipc_log_context_destroy(ffs_ipc_log);
		ffs_ipc_log = NULL;
		}
		}