Merge remote-tracking branches 'regmap/topic/lockdep' and 'regmap/topic/seq-delay' into regmap-next

This commit is contained in:
Mark Brown 2015-09-04 17:22:10 +01:00
34 changed files with 517 additions and 309 deletions

View file

@ -214,7 +214,7 @@ int st_thermal_register(struct platform_device *pdev,
sensor->ops = sensor->cdata->ops;
ret = sensor->ops->regmap_init(sensor);
ret = (sensor->ops->regmap_init)(sensor);
if (ret)
return ret;