RDMA/rxe: Return CQE error if invalid lkey was supplied

[linux-2.6-microblaze.git] / drivers / i2c / i2c-boardinfo.c

diff --git a/drivers/i2c/i2c-boardinfo.c b/drivers/i2c/i2c-boardinfo.c
index 8bc51d4..4df8ad0 100644 (file)
--- a/drivers/i2c/i2c-boardinfo.c
+++ b/drivers/i2c/i2c-boardinfo.c
@@ -47,7 +47,6 @@ 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)
 {
@@ -72,16 +71,6 @@ 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);
-                               kfree(devinfo);
-                               break;
-                       }
-               }
-
                if (info->resources) {
                        devinfo->board_info.resources =
                                kmemdup(info->resources,