From c6373b3209d25e2a09338c699c95581050a089a1 Mon Sep 17 00:00:00 2001 From: Jouni Hogander Date: Tue, 22 May 2012 13:47:07 +0300 Subject: [PATCH] logger: Do not disable Android logging completely if pti_init fails BZ: 37726 Currently logger_init exits and android logging is not initialized at all if init_pti fails. This doesn't make sense as pti is not needed by Android logging. Fix this by just printing out error message when failure happens instead of stopping the initialization. Change-Id: I51432e414659750f780d626833b8862c82544ce7 Signed-off-by: Jouni Hogander Reviewed-on: http://android.intel.com:8080/49699 Reviewed-by: Guerard, Christophe Reviewed-by: Lebouc, Christophe Tested-by: Lebouc, Christophe Reviewed-by: buildbot Tested-by: buildbot --- drivers/staging/android/logger.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/staging/android/logger.c b/drivers/staging/android/logger.c index 8a51812..1356061 100755 --- a/drivers/staging/android/logger.c +++ b/drivers/staging/android/logger.c @@ -736,7 +736,8 @@ static int __init logger_init(void) goto out; ret = init_pti(log_list[i]); if (unlikely(ret)) - goto out; + printk(KERN_ERR "logger: failed to init pti for %s, ignoring\n", + log_list[i]->misc.name); } ret = init_log_kernel_bottom(); -- 2.7.4