diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2017-03-01 18:38:33 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2017-03-01 18:38:33 -0800 |
| commit | 1c229aac139946b09ce8e7d454a615f47e85296b (patch) | |
| tree | 9a7059ac39d335a1669dd09d77c3116791952b6e | |
| parent | 8ddeda9e35a23b5ffb6046fdf827136d591a0bf2 (diff) | |
| parent | ab8f94b1da5a32c83fcc02dd3436a62c8bbb4367 (diff) | |
Merge "usb: gadget: f_fs: Fix memory leak for ipc_log_context"
| -rw-r--r-- | drivers/usb/gadget/function/f_fs.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/usb/gadget/function/f_fs.c b/drivers/usb/gadget/function/f_fs.c index 739cf9790cd4..ab44bd316217 100644 --- a/drivers/usb/gadget/function/f_fs.c +++ b/drivers/usb/gadget/function/f_fs.c @@ -1581,6 +1581,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; } @@ -1591,6 +1593,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; + } } |