aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAxel Lin <axel.lin@ingics.com>2015-07-13 01:25:34 -0400
committerMark Brown <broonie@kernel.org>2015-07-13 06:52:18 -0400
commite27d9ee6e709db070145847f9b5f52008f6eab84 (patch)
tree21fe1cb3f981ccedead261ae724959d900cbfe3a
parent32a726b2e089ec1851965290a610c4ae9cab3303 (diff)
ASoC: sti-sas: Fix checking return value for ERR_PTR
Both devm_regmap_init and syscon_regmap_lookup_by_phandle return ERR_PTR on failure. Signed-off-by: Axel Lin <axel.lin@ingics.com> Signed-off-by: Mark Brown <broonie@kernel.org>
-rw-r--r--sound/soc/codecs/sti-sas.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/sound/soc/codecs/sti-sas.c b/sound/soc/codecs/sti-sas.c
index 32db2c25a33f..4168b88ba3b1 100644
--- a/sound/soc/codecs/sti-sas.c
+++ b/sound/soc/codecs/sti-sas.c
@@ -568,17 +568,17 @@ static int sti_sas_driver_probe(struct platform_device *pdev)
568 /* Request the DAC & SPDIF registers memory region */ 568 /* Request the DAC & SPDIF registers memory region */
569 drvdata->dac.virt_regmap = devm_regmap_init(&pdev->dev, NULL, drvdata, 569 drvdata->dac.virt_regmap = devm_regmap_init(&pdev->dev, NULL, drvdata,
570 drvdata->dev_data->regmap); 570 drvdata->dev_data->regmap);
571 if (!drvdata->dac.virt_regmap) { 571 if (IS_ERR(drvdata->dac.virt_regmap)) {
572 dev_err(&pdev->dev, "audio registers not enabled\n"); 572 dev_err(&pdev->dev, "audio registers not enabled\n");
573 return -EFAULT; 573 return PTR_ERR(drvdata->dac.virt_regmap);
574 } 574 }
575 575
576 /* Request the syscon region */ 576 /* Request the syscon region */
577 drvdata->dac.regmap = 577 drvdata->dac.regmap =
578 syscon_regmap_lookup_by_phandle(pnode, "st,syscfg"); 578 syscon_regmap_lookup_by_phandle(pnode, "st,syscfg");
579 if (!drvdata->dac.regmap) { 579 if (IS_ERR(drvdata->dac.regmap)) {
580 dev_err(&pdev->dev, "syscon registers not available\n"); 580 dev_err(&pdev->dev, "syscon registers not available\n");
581 return -EFAULT; 581 return PTR_ERR(drvdata->dac.regmap);
582 } 582 }
583 drvdata->spdif.regmap = drvdata->dac.regmap; 583 drvdata->spdif.regmap = drvdata->dac.regmap;
584 584