]> git.karo-electronics.de Git - linux-beck.git/commitdiff
ASoC: sti-sas: Fix checking return value for ERR_PTR
authorAxel Lin <axel.lin@ingics.com>
Mon, 13 Jul 2015 05:25:34 +0000 (13:25 +0800)
committerMark Brown <broonie@kernel.org>
Mon, 13 Jul 2015 10:52:18 +0000 (11:52 +0100)
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>
sound/soc/codecs/sti-sas.c

index 32db2c25a33fcb42d6c9c0ec9ecfb57aea0c85c9..4168b88ba3b152d5163bc9c46b591fedc272945b 100644 (file)
@@ -568,17 +568,17 @@ static int sti_sas_driver_probe(struct platform_device *pdev)
        /* Request the DAC & SPDIF registers memory region */
        drvdata->dac.virt_regmap = devm_regmap_init(&pdev->dev, NULL, drvdata,
                                                    drvdata->dev_data->regmap);
-       if (!drvdata->dac.virt_regmap) {
+       if (IS_ERR(drvdata->dac.virt_regmap)) {
                dev_err(&pdev->dev, "audio registers not enabled\n");
-               return -EFAULT;
+               return PTR_ERR(drvdata->dac.virt_regmap);
        }
 
        /* Request the syscon region */
        drvdata->dac.regmap =
                syscon_regmap_lookup_by_phandle(pnode, "st,syscfg");
-       if (!drvdata->dac.regmap) {
+       if (IS_ERR(drvdata->dac.regmap)) {
                dev_err(&pdev->dev, "syscon registers not available\n");
-               return -EFAULT;
+               return PTR_ERR(drvdata->dac.regmap);
        }
        drvdata->spdif.regmap = drvdata->dac.regmap;