Merge remote-tracking branch 'regulator/topic/fan53555' into v3.9-rc8
This commit is contained in:
commit
5f19a85ba7
|
@ -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;
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue