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

[linux.git] / lib / kobject.c

diff --git a/lib/kobject.c b/lib/kobject.c
index 389829d3a1d1c8ff1c2b0bd529adcb8a2cc6c46a..97d86dc17c42bf09c94dcb5149ff669a7a6d49db 100644 (file)
--- a/lib/kobject.c
+++ b/lib/kobject.c
@@ -144,7 +144,7 @@ static void fill_kobj_path(struct kobject *kobj, char *path, int length)
                int cur = strlen(kobject_name(parent));
                /* back up enough to print this name with '/' */
                length -= cur;
-               strncpy(path + length, kobject_name(parent), cur);
+               memcpy(path + length, kobject_name(parent), cur);
                *(path + --length) = '/';
        }