diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2017-02-28 11:10:51 -0800 |
|---|---|---|
| committer | Wolfram Sang <wsa@the-dreams.de> | 2017-03-08 18:05:09 +0100 |
| commit | b0c1e95ab44feaad8831f2c06a3473c974003b49 (patch) | |
| tree | 08bac8d942361f352e4a457aa6af2c9b8ac9937f /drivers/i2c | |
| parent | 1945250d979203ed326b5a44fd705b6b2c46eec5 (diff) | |
| download | linux-stable-b0c1e95ab44feaad8831f2c06a3473c974003b49.tar.gz linux-stable-b0c1e95ab44feaad8831f2c06a3473c974003b49.tar.bz2 linux-stable-b0c1e95ab44feaad8831f2c06a3473c974003b49.zip | |
i2c: copy device properties when using i2c_register_board_info()
This will allow marking device property lists as __initdata, the same as
board info structures themselves.
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Signed-off-by: Wolfram Sang <wsa@the-dreams.de>
Diffstat (limited to 'drivers/i2c')
| -rw-r--r-- | drivers/i2c/i2c-boardinfo.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/drivers/i2c/i2c-boardinfo.c b/drivers/i2c/i2c-boardinfo.c index 6e5fac6a5262..5b8f6c3a6950 100644 --- a/drivers/i2c/i2c-boardinfo.c +++ b/drivers/i2c/i2c-boardinfo.c @@ -15,6 +15,7 @@ #include <linux/export.h> #include <linux/i2c.h> #include <linux/kernel.h> +#include <linux/property.h> #include <linux/rwsem.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 * 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) { @@ -78,6 +80,14 @@ int i2c_register_board_info(int busnum, struct i2c_board_info const *info, unsig devinfo->busnum = busnum; devinfo->board_info = *info; + + if (info->properties) { + devinfo->board_info.properties = + property_entries_dup(info->properties); + if (IS_ERR(devinfo->board_info.properties)) + return PTR_ERR(devinfo->board_info.properties); + } + list_add_tail(&devinfo->list, &__i2c_board_list); } |