diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2017-03-30 17:48:49 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2017-03-30 17:48:49 +0200 |
| commit | 99b19a1f21c68334f8c919c3d6ca4a18be31cf69 (patch) | |
| tree | b54495ad66a19f7e88e3b84495f2ee9bc72f03d5 /include/linux | |
| parent | 49240e87a03fdb27413bfd9a1b9785257d7961d5 (diff) | |
| parent | 7a9bc330df9b8fb3245d50a198b5c6d4d634b06f (diff) | |
| download | linux-99b19a1f21c68334f8c919c3d6ca4a18be31cf69.tar.gz linux-99b19a1f21c68334f8c919c3d6ca4a18be31cf69.tar.bz2 linux-99b19a1f21c68334f8c919c3d6ca4a18be31cf69.zip | |
Merge tag 'amlogic-drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-amlogic into next/drivers
Pull "Amlogic driver updates for v4.12" from Kevin Hilman:
- firmware: updates/fixes for meson-sm
* tag 'amlogic-drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-amlogic:
firmware: meson-sm: Allow 0 as valid return value
firmware: meson-sm: Check for buffer output size
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/firmware/meson/meson_sm.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/firmware/meson/meson_sm.h b/include/linux/firmware/meson/meson_sm.h index 8e953c6f394a..37a5eaea69dd 100644 --- a/include/linux/firmware/meson/meson_sm.h +++ b/include/linux/firmware/meson/meson_sm.h @@ -25,7 +25,7 @@ int meson_sm_call(unsigned int cmd_index, u32 *ret, u32 arg0, u32 arg1, u32 arg2, u32 arg3, u32 arg4); int meson_sm_call_write(void *buffer, unsigned int b_size, unsigned int cmd_index, u32 arg0, u32 arg1, u32 arg2, u32 arg3, u32 arg4); -int meson_sm_call_read(void *buffer, unsigned int cmd_index, u32 arg0, u32 arg1, - u32 arg2, u32 arg3, u32 arg4); +int meson_sm_call_read(void *buffer, unsigned int bsize, unsigned int cmd_index, + u32 arg0, u32 arg1, u32 arg2, u32 arg3, u32 arg4); #endif /* _MESON_SM_FW_H_ */ |