Merge branch 'powercap'

* powercap:
  PowerCap: Fix build error with option -Werror=format-security
This commit is contained in:
Rafael J. Wysocki 2013-11-07 19:23:20 +01:00
commit a4aaf2e0df

View file

@ -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)