Commit a4aaf2e0 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

Merge branch 'powercap' 

* powercap:
  PowerCap: Fix build error with option -Werror=format-security
parents cf8a1af8 08ff4cbe

drivers/powercap/powercap_sys.c

+1 −1
Original line number Diff line number Diff line
@@ -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)