aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/base/core.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/base/core.c')
-rw-r--r--drivers/base/core.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/base/core.c b/drivers/base/core.c
index 7e8576d7822d..4d59975c24a8 100644
--- a/drivers/base/core.c
+++ b/drivers/base/core.c
@@ -875,7 +875,7 @@ int device_add(struct device *dev)
875 * the name, and force the use of dev_name() 875 * the name, and force the use of dev_name()
876 */ 876 */
877 if (dev->init_name) { 877 if (dev->init_name) {
878 dev_set_name(dev, dev->init_name); 878 dev_set_name(dev, "%s", dev->init_name);
879 dev->init_name = NULL; 879 dev->init_name = NULL;
880 } 880 }
881 881
@@ -1272,7 +1272,7 @@ struct device *__root_device_register(const char *name, struct module *owner)
1272 if (!root) 1272 if (!root)
1273 return ERR_PTR(err); 1273 return ERR_PTR(err);
1274 1274
1275 err = dev_set_name(&root->dev, name); 1275 err = dev_set_name(&root->dev, "%s", name);
1276 if (err) { 1276 if (err) {
1277 kfree(root); 1277 kfree(root);
1278 return ERR_PTR(err); 1278 return ERR_PTR(err);