Merge tag 'char-misc-4.15-rc1' of ssh://gitolite.kernel.org/pub/scm/linux/kernel...

[sfrench/cifs-2.6.git] / drivers / android / binder.c

diff --git a/drivers/android/binder.c b/drivers/android/binder.c
index fddf76ef5bd6d824e2017fedb9110418b45270de..a73596a4f804c817bfd277d3ff51eb42ca969bae 100644 (file)
--- a/drivers/android/binder.c
+++ b/drivers/android/binder.c
@@ -150,7 +150,7 @@ static DECLARE_WAIT_QUEUE_HEAD(binder_user_error_wait);
 static int binder_stop_on_user_error;
 
 static int binder_set_stop_on_user_error(const char *val,
-                                        struct kernel_param *kp)
+                                        const struct kernel_param *kp)
 {
        int ret;
 
@@ -2192,7 +2192,7 @@ static void binder_transaction_buffer_release(struct binder_proc *proc,
                                                     off_start,
                                                     offp - off_start);
                        if (!parent) {
-                               pr_err("transaction release %d bad parent offset",
+                               pr_err("transaction release %d bad parent offset\n",
                                       debug_id);
                                continue;
                        }