Merge branch 'powercap'

* powercap: PowerCap: Fix build error with option -Werror=format-security
opendata26 · Nov 7, 2013 · a4aaf2e · a4aaf2e
2 parents cf8a1af + 08ff4cb
commit a4aaf2e
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/drivers/powercap/powercap_sys.c b/drivers/powercap/powercap_sys.c
@@ -625,7 +625,7 @@ struct powercap_control_type *powercap_register_control_type(
 	control_type->ops = ops;
 	INIT_LIST_HEAD(&control_type->node);
 	control_type->dev.class = &powercap_class;
-	dev_set_name(&control_type->dev, name);
+	dev_set_name(&control_type->dev, "%s", name);
 	result = device_register(&control_type->dev);
 	if (result) {
 		if (control_type->allocated)