Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next-2.6

[firefly-linux-kernel-4.4.55.git] / drivers / video / output.c

diff --git a/drivers/video/output.c b/drivers/video/output.c
index f2df5519c9c455557bf039b899e0d45a123054c0..5e6439ae739471386ea54fda7e603003dff8eb4f 100644 (file)
--- a/drivers/video/output.c
+++ b/drivers/video/output.c
@@ -96,7 +96,7 @@ struct output_device *video_output_register(const char *name,
        new_dev->props = op;
        new_dev->dev.class = &video_output_class;
        new_dev->dev.parent = dev;
-       strlcpy(new_dev->dev.bus_id,name, BUS_ID_SIZE);
+       dev_set_name(&new_dev->dev, name);
        dev_set_drvdata(&new_dev->dev, devdata);
        ret_code = device_register(&new_dev->dev);
        if (ret_code) {