Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-12-14 07:02:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

i2c: copy device properties when using i2c_register_board_info()

Browse Source 
This will allow marking device property lists as __initdata, the same as
board info structures themselves.

Reviewed-by: Wolfram Sang <wsa@the-dreams.de>
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
This commit is contained in:
Dmitry Torokhov 2017-02-27 20:09:09 -08:00
parent 00a06c22e9
commit 0daaf99d84
1 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/i2c/i2c-boardinfo.c
View File

@ -15,6 +15,7 @@
#include <linux/export.h> #include <linux/export.h>
#include <linux/i2c.h> #include <linux/i2c.h>
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/property.h>
#include <linux/rwsem.h> #include <linux/rwsem.h>
#include <linux/slab.h> #include <linux/slab.h>
@ -55,6 +56,7 @@ EXPORT_SYMBOL_GPL(__i2c_first_dynamic_bus_num);
* *
* The board info passed can safely be __initdata, but be careful of embedded * The board info passed can safely be __initdata, but be careful of embedded
* pointers (for platform_data, functions, etc) since that won't be copied. * pointers (for platform_data, functions, etc) since that won't be copied.
* Device properties are deep-copied though.
*/ */
int i2c_register_board_info(int busnum, struct i2c_board_info const *info, unsigned len) int i2c_register_board_info(int busnum, struct i2c_board_info const *info, unsigned len)
{ {
@ -78,6 +80,16 @@ int i2c_register_board_info(int busnum, struct i2c_board_info const *info, unsig
devinfo->busnum = busnum; devinfo->busnum = busnum;
devinfo->board_info = *info; devinfo->board_info = *info;
if (info->properties) {
devinfo->board_info.properties =
property_entries_dup(info->properties);
if (IS_ERR(devinfo->board_info.properties)) {
status = PTR_ERR(devinfo->board_info.properties);
break;
}
}
list_add_tail(&devinfo->list, &__i2c_board_list); list_add_tail(&devinfo->list, &__i2c_board_list);
} }