Merge tag 'drm-intel-next-2014-03-21' of git://anongit.freedesktop.org/drm-intel...

[linux.git] / drivers / gpu / drm / drm_dp_helper.c

diff --git a/drivers/gpu/drm/drm_dp_helper.c b/drivers/gpu/drm/drm_dp_helper.c
index 74724aacb8ae92d7c08a23da351349c486376617..f4babed2f5570eb3664bd556df030b0ff51bc45c 100644 (file)
--- a/drivers/gpu/drm/drm_dp_helper.c
+++ b/drivers/gpu/drm/drm_dp_helper.c
@@ -726,7 +726,8 @@ int drm_dp_aux_register_i2c_bus(struct drm_dp_aux *aux)
        aux->ddc.dev.parent = aux->dev;
        aux->ddc.dev.of_node = aux->dev->of_node;
 
-       strncpy(aux->ddc.name, dev_name(aux->dev), sizeof(aux->ddc.name));
+       strlcpy(aux->ddc.name, aux->name ? aux->name : dev_name(aux->dev),
+               sizeof(aux->ddc.name));
 
        return i2c_add_adapter(&aux->ddc);
 }