1 files changed, 22 insertions, 15 deletions

diff --git a/drivers/android/binder.c b/drivers/android/binder.c
index cdfc87629efb..4d2b2ad1ee0e 100644
--- a/drivers/android/binder.c
+++ b/drivers/android/binder.c
@@ -5854,9 +5854,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)
@@ -5898,23 +5899,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: