diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-08-31 20:53:12 -0700 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-08-31 20:53:12 -0700 |
commit | e9723bf2ad1b7384e8d475e5356f51a1f35a8934 (patch) | |
tree | d9e6008e3bc147391634299dfb0f010591d52063 /drivers/staging/android | |
parent | 79f284d29bbf7852093d0262c097e8faee32bc03 (diff) | |
parent | 69e273c0b0a3c337a521d083374c918dc52c666f (diff) | |
download | op-kernel-dev-e9723bf2ad1b7384e8d475e5356f51a1f35a8934.zip op-kernel-dev-e9723bf2ad1b7384e8d475e5356f51a1f35a8934.tar.gz |
Merge 3.17-rc3 into staging-next
We want the staging bugfixes in this branch as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/android')
-rw-r--r-- | drivers/staging/android/logger.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/staging/android/logger.c b/drivers/staging/android/logger.c index 9b47e66..0bf0d24 100644 --- a/drivers/staging/android/logger.c +++ b/drivers/staging/android/logger.c @@ -790,7 +790,7 @@ static int __init create_log(char *log_name, int size) if (unlikely(ret)) { pr_err("failed to register misc device for log '%s'!\n", log->misc.name); - goto out_free_log; + goto out_free_misc_name; } pr_info("created %luK log '%s'\n", @@ -798,6 +798,9 @@ static int __init create_log(char *log_name, int size) return 0; +out_free_misc_name: + kfree(log->misc.name); + out_free_log: kfree(log); |