diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-11-07 13:23:20 -0500 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-11-07 13:23:20 -0500 |
| commit | a4aaf2e0dfcc05578e8c822fce975a7d5836dc7f (patch) | |
| tree | 5185561547458f97069cad703a6b74fcec7bbf0d | |
| parent | cf8a1af855cfce135c31b84d29a7cb870638cdaa (diff) | |
| parent | 08ff4cbe10da402e7c493ac72e298975f62a9e78 (diff) | |
Merge branch 'powercap'
* powercap:
PowerCap: Fix build error with option -Werror=format-security
| -rw-r--r-- | drivers/powercap/powercap_sys.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/powercap/powercap_sys.c b/drivers/powercap/powercap_sys.c index 21814f90a44b..8d0fe431dbdd 100644 --- a/drivers/powercap/powercap_sys.c +++ b/drivers/powercap/powercap_sys.c | |||
| @@ -625,7 +625,7 @@ struct powercap_control_type *powercap_register_control_type( | |||
| 625 | control_type->ops = ops; | 625 | control_type->ops = ops; |
| 626 | INIT_LIST_HEAD(&control_type->node); | 626 | INIT_LIST_HEAD(&control_type->node); |
| 627 | control_type->dev.class = &powercap_class; | 627 | control_type->dev.class = &powercap_class; |
| 628 | dev_set_name(&control_type->dev, name); | 628 | dev_set_name(&control_type->dev, "%s", name); |
| 629 | result = device_register(&control_type->dev); | 629 | result = device_register(&control_type->dev); |
| 630 | if (result) { | 630 | if (result) { |
| 631 | if (control_type->allocated) | 631 | if (control_type->allocated) |