mirror of
				https://github.com/torvalds/linux.git
				synced 2025-11-04 02:30:34 +02:00 
			
		
		
		
	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. Reviewed-by: Wolfram Sang <wsa@the-dreams.de> Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
This commit is contained in:
		
							parent
							
								
									00a06c22e9
								
							
						
					
					
						commit
						0daaf99d84
					
				
					 1 changed files with 12 additions and 0 deletions
				
			
		| 
						 | 
				
			
			@ -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,16 @@ 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)) {
 | 
			
		||||
				status = PTR_ERR(devinfo->board_info.properties);
 | 
			
		||||
				break;
 | 
			
		||||
			}
 | 
			
		||||
		}
 | 
			
		||||
 | 
			
		||||
		list_add_tail(&devinfo->list, &__i2c_board_list);
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
		Reference in a new issue