diff options
| author | Greg Kroah-Hartman | 2019-02-11 09:05:58 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2019-02-11 09:05:58 +0100 |
| commit | 5c07488d996b6b2af609f351bf54c9909ed0fdf8 (patch) | |
| tree | 62cc2522698d7383cdf4a4f450bde30bc45f1832 /drivers/android/binder.c | |
| parent | coresight: Use event attributes for sink selection (diff) | |
| parent | Linux 5.0-rc6 (diff) | |
| download | kernel-qcow2-linux-5c07488d996b6b2af609f351bf54c9909ed0fdf8.tar.gz kernel-qcow2-linux-5c07488d996b6b2af609f351bf54c9909ed0fdf8.tar.xz kernel-qcow2-linux-5c07488d996b6b2af609f351bf54c9909ed0fdf8.zip | |
Merge 5.0-rc6 into char-misc-next
We need the char-misc fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/android/binder.c')
| -rw-r--r-- | drivers/android/binder.c | 37 |
1 files changed, 22 insertions, 15 deletions
diff --git a/drivers/android/binder.c b/drivers/android/binder.c index 5f6ef5e63b91..01f80cbd2741 100644 --- a/drivers/android/binder.c +++ b/drivers/android/binder.c @@ -5914,9 +5914,10 @@ static int __init init_binder_device(const char *name) static int __init binder_init(void) { int ret; - char *device_name, *device_names, *device_tmp; + char *device_name, *device_tmp; struct binder_device *device; struct hlist_node *tmp; + char *device_names = NULL; ret = binder_alloc_shrinker_init(); if (ret) @@ -5958,23 +5959,29 @@ static int __init binder_init(void) &transaction_log_fops); } - /* - * Copy the module_parameter string, because we don't want to - * tokenize it in-place. - */ - device_names = kstrdup(binder_devices_param, GFP_KERNEL); - if (!device_names) { - ret = -ENOMEM; - goto err_alloc_device_names_failed; - } + if (strcmp(binder_devices_param, "") != 0) { + /* + * Copy the module_parameter string, because we don't want to + * tokenize it in-place. + */ + device_names = kstrdup(binder_devices_param, GFP_KERNEL); + if (!device_names) { + ret = -ENOMEM; + goto err_alloc_device_names_failed; + } - device_tmp = device_names; - while ((device_name = strsep(&device_tmp, ","))) { - ret = init_binder_device(device_name); - if (ret) - goto err_init_binder_device_failed; + device_tmp = device_names; + while ((device_name = strsep(&device_tmp, ","))) { + ret = init_binder_device(device_name); + if (ret) + goto err_init_binder_device_failed; + } } + ret = init_binderfs(); + if (ret) + goto err_init_binder_device_failed; + return ret; err_init_binder_device_failed: |