Merge branch 'asoc-5.3' into asoc-5.4

This commit is contained in:
Mark Brown
2019-08-20 18:28:43 +01:00
18 changed files with 234 additions and 75 deletions

View File

@@ -325,7 +325,7 @@ int axg_tdm_formatter_probe(struct platform_device *pdev)
}
/* Formatter dedicated reset line */
formatter->reset = reset_control_get_optional_exclusive(dev, NULL);
formatter->reset = devm_reset_control_get_optional_exclusive(dev, NULL);
if (IS_ERR(formatter->reset)) {
ret = PTR_ERR(formatter->reset);
if (ret != -EPROBE_DEFER)