mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-31 04:01:48 -04:00
Merge 4.14-rc5 into char-misc-next
We need the fixes in here to resolve merge issues and for testing. Signed-off-by: Greg Kroah-Hartman <[email protected]>
This commit is contained in:
commit
58f2c391cc
1164 changed files with 14755 additions and 7514 deletions
|
|
@ -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);
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue