commit a4aaf2e0dfcc05578e8c822fce975a7d5836dc7f
author Rafael J. Wysocki <rafael.j.wysocki@intel.com> Thu Nov 07 19:23:20 2013 +0100
committer Rafael J. Wysocki <rafael.j.wysocki@intel.com> Thu Nov 07 19:23:20 2013 +0100
tree 5185561547458f97069cad703a6b74fcec7bbf0d
parent cf8a1af855cfce135c31b84d29a7cb870638cdaa
parent 08ff4cbe10da402e7c493ac72e298975f62a9e78

Merge branch 'powercap'

* powercap:
  PowerCap: Fix build error with option -Werror=format-security

drivers/powercap/powercap_sys.c

diff --git a/drivers/powercap/powercap_sys.c b/drivers/powercap/powercap_sys.c
index 21814f9..8d0fe43 100644
--- a/drivers/powercap/powercap_sys.c
+++ b/drivers/powercap/powercap_sys.c
@@ -625,7 +625,7 @@
 	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)