Merge drm/drm-next into drm-misc-next

[linux-2.6-microblaze.git] / drivers / hwtracing / coresight / coresight-cti-sysfs.c

diff --git a/drivers/hwtracing/coresight/coresight-cti-sysfs.c b/drivers/hwtracing/coresight/coresight-cti-sysfs.c
index 392757f..7ff7e77 100644 (file)
--- a/drivers/hwtracing/coresight/coresight-cti-sysfs.c
+++ b/drivers/hwtracing/coresight/coresight-cti-sysfs.c
@@ -1065,6 +1065,13 @@ static int cti_create_con_sysfs_attr(struct device *dev,
        }
        eattr->var = con;
        con->con_attrs[attr_idx] = &eattr->attr.attr;
+       /*
+        * Initialize the dynamically allocated attribute
+        * to avoid LOCKDEP splat. See include/linux/sysfs.h
+        * for more details.
+        */
+       sysfs_attr_init(con->con_attrs[attr_idx]);
+
        return 0;
 }