Merge 4.14-rc4 into staging-next

We want the staging/iio fixes in here as well to handle merge issues.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

1 files changed, 2 insertions, 1 deletions

diff --git a/drivers/nvmem/core.c b/drivers/nvmem/core.c
index de54c7f5048a..d12e5de78e70 100644
--- a/drivers/nvmem/core.c
+++ b/drivers/nvmem/core.c
@@ -135,7 +135,7 @@ static ssize_t bin_attr_nvmem_write(struct file *filp, struct kobject *kobj,
 
         /* Stop the user from writing */
         if (pos >= nvmem->size)
-                return 0;
+                return -EFBIG;
 
         if (count < nvmem->word_size)
                 return -EINVAL;
@@ -789,6 +789,7 @@ struct nvmem_cell *of_nvmem_cell_get(struct device_node *np,
                 return ERR_PTR(-EINVAL);
 
         nvmem = __nvmem_device_get(nvmem_np, NULL, NULL);
+        of_node_put(nvmem_np);
         if (IS_ERR(nvmem))
                 return ERR_CAST(nvmem);