projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'D01-for-3.18' of git://github.com/hisilicon/linux-hisi into next/soc
[cascardo/linux.git]
/
drivers
/
staging
/
android
/
logger.c
diff --git
a/drivers/staging/android/logger.c
b/drivers/staging/android/logger.c
index
9b47e66
..
0bf0d24
100644
(file)
--- 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);
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",
}
pr_info("created %luK log '%s'\n",
@@
-798,6
+798,9
@@
static int __init create_log(char *log_name, int size)
return 0;
return 0;
+out_free_misc_name:
+ kfree(log->misc.name);
+
out_free_log:
kfree(log);
out_free_log:
kfree(log);