Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5f19a85b authored by Mark Brown's avatar Mark Brown
Browse files

Merge remote-tracking branch 'regulator/topic/fan53555' into v3.9-rc8

parents 1d60a4cf eb8ad609
Loading
Loading
Loading
Loading
+1 −3
Original line number Original line Diff line number Diff line
@@ -219,9 +219,7 @@ static int fan53555_regulator_register(struct fan53555_device_info *di,
	rdesc->owner = THIS_MODULE;
	rdesc->owner = THIS_MODULE;


	di->rdev = regulator_register(&di->desc, config);
	di->rdev = regulator_register(&di->desc, config);
	if (IS_ERR(di->rdev))
	return PTR_RET(di->rdev);
		return PTR_ERR(di->rdev);
	return 0;


}
}