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

Merge branch 'pm-powercap' 

Fix a possible memory leak in the power capping subsystem (Joe Hattori).

* pm-powercap:
  powercap: call put_device() on an error path in powercap_register_control_type()
parents b3cc5afc 93c66fbc

drivers/powercap/powercap_sys.c

+1 −2
Original line number Diff line number Diff line
@@ -627,8 +627,7 @@ struct powercap_control_type *powercap_register_control_type( 
	dev_set_name(&control_type->dev, "%s", name);

	result = device_register(&control_type->dev);

	if (result) {

		if (control_type->allocated)

			kfree(control_type);

		put_device(&control_type->dev);

		return ERR_PTR(result);

	}

	idr_init(&control_type->idr);