11 files changed, 45 insertions, 43 deletions

diff --git a/drivers/android/binder.c b/drivers/android/binder.c
index aae4d8d4be36..f7665c31feca 100644
--- a/drivers/android/binder.c
+++ b/drivers/android/binder.c
@@ -2200,8 +2200,12 @@ static void binder_transaction(struct binder_proc *proc,
         list_add_tail(&t->work.entry, target_list);
         tcomplete->type = BINDER_WORK_TRANSACTION_COMPLETE;
         list_add_tail(&tcomplete->entry, &thread->todo);
-        if (target_wait)
-                wake_up_interruptible(target_wait);
+        if (target_wait) {
+                if (reply || !(t->flags & TF_ONE_WAY))
+                        wake_up_interruptible_sync(target_wait);
+                else
+                        wake_up_interruptible(target_wait);
+        }
         return;
 
 err_translate_failed:
@@ -3247,10 +3251,6 @@ static long binder_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
         /*pr_info("binder_ioctl: %d:%d %x %lx\n",
                         proc->pid, current->pid, cmd, arg);*/
 
-        if (unlikely(current->mm != proc->vma_vm_mm)) {
-                pr_err("current mm mismatch proc mm\n");
-                return -EINVAL;
-        }
         trace_binder_ioctl(cmd, arg);
 
         ret = wait_event_interruptible(binder_user_error_wait, binder_stop_on_user_error < 2);
@@ -3464,9 +3464,8 @@ static int binder_open(struct inode *nodp, struct file *filp)
         proc = kzalloc(sizeof(*proc), GFP_KERNEL);
         if (proc == NULL)
                 return -ENOMEM;
-        get_task_struct(current);
-        proc->tsk = current;
-        proc->vma_vm_mm = current->mm;
+        get_task_struct(current->group_leader);
+        proc->tsk = current->group_leader;
         INIT_LIST_HEAD(&proc->todo);
         init_waitqueue_head(&proc->wait);
         proc->default_priority = task_nice(current);
diff --git a/drivers/fsi/fsi-core.c b/drivers/fsi/fsi-core.c
index a485864cb512..06432d84cbf8 100644
--- a/drivers/fsi/fsi-core.c
+++ b/drivers/fsi/fsi-core.c
@@ -532,7 +532,7 @@ static inline uint32_t fsi_smode_sid(int x)
         return (x & FSI_SMODE_SID_MASK) << FSI_SMODE_SID_SHIFT;
 }
 
-static const uint32_t fsi_slave_smode(int id)
+static uint32_t fsi_slave_smode(int id)
 {
         return FSI_SMODE_WSC | FSI_SMODE_ECRC
                 | fsi_smode_sid(id)
@@ -883,17 +883,16 @@ struct bus_type fsi_bus_type = {
 };
 EXPORT_SYMBOL_GPL(fsi_bus_type);
 
-static int fsi_init(void)
+static int __init fsi_init(void)
 {
         return bus_register(&fsi_bus_type);
 }
+postcore_initcall(fsi_init);
 
 static void fsi_exit(void)
 {
         bus_unregister(&fsi_bus_type);
 }
-
-module_init(fsi_init);
 module_exit(fsi_exit);
 module_param(discard_errors, int, 0664);
 MODULE_LICENSE("GPL");
diff --git a/drivers/hv/channel.c b/drivers/hv/channel.c
index e9bf0bb87ac4..e57cc40cb768 100644
--- a/drivers/hv/channel.c
+++ b/drivers/hv/channel.c
@@ -606,6 +606,8 @@ static int vmbus_close_internal(struct vmbus_channel *channel)
                 get_order(channel->ringbuffer_pagecount * PAGE_SIZE));
 
 out:
+        /* re-enable tasklet for use on re-open */
+        tasklet_enable(&channel->callback_event);
         return ret;
 }
 
diff --git a/drivers/mux/Kconfig b/drivers/mux/Kconfig
index 7c754a0f14bb..19e4e904c9bf 100644
--- a/drivers/mux/Kconfig
+++ b/drivers/mux/Kconfig
@@ -2,20 +2,11 @@
 # Multiplexer devices
 #
 
-menuconfig MULTIPLEXER
-        tristate "Multiplexer subsystem"
-        help
-          Multiplexer controller subsystem. Multiplexers are used in a
-          variety of settings, and this subsystem abstracts their use
-          so that the rest of the kernel sees a common interface. When
-          multiple parallel multiplexers are controlled by one single
-          multiplexer controller, this subsystem also coordinates the
-          multiplexer accesses.
-
-          To compile the subsystem as a module, choose M here: the module will
-          be called mux-core.
+config MULTIPLEXER
+        tristate
 
-if MULTIPLEXER
+menu "Multiplexer drivers"
+        depends on MULTIPLEXER
 
 config MUX_ADG792A
         tristate "Analog Devices ADG792A/ADG792G Multiplexers"
@@ -56,4 +47,4 @@ config MUX_MMIO
           To compile the driver as a module, choose M here: the module will
           be called mux-mmio.
 
-endif
+endmenu
diff --git a/drivers/mux/mux-core.c b/drivers/mux/mux-core.c
index 90b8995f07cb..2fe96c470112 100644
--- a/drivers/mux/mux-core.c
+++ b/drivers/mux/mux-core.c
@@ -46,7 +46,7 @@ static int __init mux_init(void)
 
 static void __exit mux_exit(void)
 {
-        class_register(&mux_class);
+        class_unregister(&mux_class);
         ida_destroy(&mux_ida);
 }
 
diff --git a/drivers/nvmem/rockchip-efuse.c b/drivers/nvmem/rockchip-efuse.c
index a0d4ede9b8fc..63e3eb55f3ac 100644
--- a/drivers/nvmem/rockchip-efuse.c
+++ b/drivers/nvmem/rockchip-efuse.c
@@ -170,7 +170,7 @@ static const struct of_device_id rockchip_efuse_match[] = {
                 .data = (void *)&rockchip_rk3288_efuse_read,
         },
         {
-                .compatible = "rockchip,rk322x-efuse",
+                .compatible = "rockchip,rk3228-efuse",
                 .data = (void *)&rockchip_rk3288_efuse_read,
         },
         {
diff --git a/drivers/spmi/spmi-pmic-arb.c b/drivers/spmi/spmi-pmic-arb.c
index 2afe3597982e..f4b7a98a7913 100644
--- a/drivers/spmi/spmi-pmic-arb.c
+++ b/drivers/spmi/spmi-pmic-arb.c
@@ -134,7 +134,6 @@ struct apid_data {
  * @spmic:              SPMI controller object
  * @ver_ops:            version dependent operations.
  * @ppid_to_apid        in-memory copy of PPID -> channel (APID) mapping table.
- *                      v2 only.
  */
 struct spmi_pmic_arb {
         void __iomem            *rd_base;
@@ -1016,6 +1015,13 @@ static int spmi_pmic_arb_probe(struct platform_device *pdev)
                 goto err_put_ctrl;
         }
 
+        pa->ppid_to_apid = devm_kcalloc(&ctrl->dev, PMIC_ARB_MAX_PPID,
+                                        sizeof(*pa->ppid_to_apid), GFP_KERNEL);
+        if (!pa->ppid_to_apid) {
+                err = -ENOMEM;
+                goto err_put_ctrl;
+        }
+
         hw_ver = readl_relaxed(core + PMIC_ARB_VERSION);
 
         if (hw_ver < PMIC_ARB_VERSION_V2_MIN) {
@@ -1048,15 +1054,6 @@ static int spmi_pmic_arb_probe(struct platform_device *pdev)
                         err = PTR_ERR(pa->wr_base);
                         goto err_put_ctrl;
                 }
-
-                pa->ppid_to_apid = devm_kcalloc(&ctrl->dev,
-                                                PMIC_ARB_MAX_PPID,
-                                                sizeof(*pa->ppid_to_apid),
-                                                GFP_KERNEL);
-                if (!pa->ppid_to_apid) {
-                        err = -ENOMEM;
-                        goto err_put_ctrl;
-                }
         }
 
         dev_info(&ctrl->dev, "PMIC arbiter version %s (0x%x)\n",
diff --git a/drivers/spmi/spmi.c b/drivers/spmi/spmi.c
index 2b9b0941d9eb..6d23226e5f69 100644
--- a/drivers/spmi/spmi.c
+++ b/drivers/spmi/spmi.c
@@ -365,11 +365,23 @@ static int spmi_drv_remove(struct device *dev)
         return 0;
 }
 
+static int spmi_drv_uevent(struct device *dev, struct kobj_uevent_env *env)
+{
+        int ret;
+
+        ret = of_device_uevent_modalias(dev, env);
+        if (ret != -ENODEV)
+                return ret;
+
+        return 0;
+}
+
 static struct bus_type spmi_bus_type = {
         .name           = "spmi",
         .match          = spmi_device_match,
         .probe          = spmi_drv_probe,
         .remove         = spmi_drv_remove,
+        .uevent         = spmi_drv_uevent,
 };
 
 /**
diff --git a/drivers/thunderbolt/switch.c b/drivers/thunderbolt/switch.c
index ab3e8f410444..40219a706309 100644
--- a/drivers/thunderbolt/switch.c
+++ b/drivers/thunderbolt/switch.c
@@ -281,9 +281,11 @@ static struct nvmem_device *register_nvmem(struct tb_switch *sw, int id,
         if (active) {
                 config.name = "nvm_active";
                 config.reg_read = tb_switch_nvm_read;
+                config.read_only = true;
         } else {
                 config.name = "nvm_non_active";
                 config.reg_write = tb_switch_nvm_write;
+                config.root_only = true;
         }
 
         config.id = id;
@@ -292,7 +294,6 @@ static struct nvmem_device *register_nvmem(struct tb_switch *sw, int id,
         config.size = size;
         config.dev = &sw->dev;
         config.owner = THIS_MODULE;
-        config.root_only = true;
         config.priv = sw;
 
         return nvmem_register(&config);
diff --git a/drivers/w1/masters/omap_hdq.c b/drivers/w1/masters/omap_hdq.c
index 3612542b6044..83fc9aab34e8 100644
--- a/drivers/w1/masters/omap_hdq.c
+++ b/drivers/w1/masters/omap_hdq.c
@@ -704,7 +704,8 @@ static int omap_hdq_probe(struct platform_device *pdev)
 
         irq = platform_get_irq(pdev, 0);
         if (irq < 0) {
-                ret = -ENXIO;
+                dev_dbg(&pdev->dev, "Failed to get IRQ: %d\n", irq);
+                ret = irq;
                 goto err_irq;
         }
 
diff --git a/drivers/w1/w1.c b/drivers/w1/w1.c
index 95ea7e6b1d99..74471e7aa5cc 100644
--- a/drivers/w1/w1.c
+++ b/drivers/w1/w1.c
@@ -728,6 +728,7 @@ int w1_attach_slave_device(struct w1_master *dev, struct w1_reg_num *rn)
         memcpy(&sl->reg_num, rn, sizeof(sl->reg_num));
         atomic_set(&sl->refcnt, 1);
         atomic_inc(&sl->master->refcnt);
+        dev->slave_count++;
 
         /* slave modules need to be loaded in a context with unlocked mutex */
         mutex_unlock(&dev->mutex);
@@ -747,11 +748,11 @@ int w1_attach_slave_device(struct w1_master *dev, struct w1_reg_num *rn)
 
         sl->family = f;
 
-
         err = __w1_attach_slave_device(sl);
         if (err < 0) {
                 dev_err(&dev->dev, "%s: Attaching %s failed.\n", __func__,
                          sl->name);
+                dev->slave_count--;
                 w1_family_put(sl->family);
                 atomic_dec(&sl->master->refcnt);
                 kfree(sl);
@@ -759,7 +760,6 @@ int w1_attach_slave_device(struct w1_master *dev, struct w1_reg_num *rn)
         }
 
         sl->ttl = dev->slave_ttl;
-        dev->slave_count++;
 
         memcpy(msg.id.id, rn, sizeof(msg.id));
         msg.type = W1_SLAVE_ADD;