Merge branch 'kconfig-diet' from Dave Hansen

[cascardo/linux.git] / drivers / video / output.c

diff --git a/drivers/video/output.c b/drivers/video/output.c
index 0d6f2cd..6285b97 100644 (file)
--- a/drivers/video/output.c
+++ b/drivers/video/output.c
@@ -97,7 +97,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;
-       dev_set_name(&new_dev->dev, name);
+       dev_set_name(&new_dev->dev, "%s", name);
        dev_set_drvdata(&new_dev->dev, devdata);
        ret_code = device_register(&new_dev->dev);
        if (ret_code) {