aboutsummaryrefslogtreecommitdiffstats
path: root/sound/soc/fsl
diff options
context:
space:
mode:
authorWei Yongjun <yongjun_wei@trendmicro.com.cn>2013-10-25 05:29:25 -0400
committerMark Brown <broonie@linaro.org>2013-10-26 16:32:29 -0400
commit3d8f7318f929f3b84571ffac2ef7bf8bddfb6d41 (patch)
tree0d381830316c7ada7b34dfcd49265ce46048bd7e /sound/soc/fsl
parent154bab12e1db824ad12ffd6df2d213dfb3d09878 (diff)
ASoC: fsl_spdif: fix return value check in fsl_spdif_probe()
In case of error, the function platform_get_resource() returns NULL pointer not ERR_PTR(). The IS_ERR() test in the return value check should be replaced with NULL test. Signed-off-by: Wei Yongjun <yongjun_wei@trendmicro.com.cn> Signed-off-by: Mark Brown <broonie@linaro.org>
Diffstat (limited to 'sound/soc/fsl')
-rw-r--r--sound/soc/fsl/fsl_spdif.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/soc/fsl/fsl_spdif.c b/sound/soc/fsl/fsl_spdif.c
index c0fea02114e1..e1bf5ef31bdd 100644
--- a/sound/soc/fsl/fsl_spdif.c
+++ b/sound/soc/fsl/fsl_spdif.c
@@ -1107,9 +1107,9 @@ static int fsl_spdif_probe(struct platform_device *pdev)
1107 1107
1108 /* Get the addresses and IRQ */ 1108 /* Get the addresses and IRQ */
1109 res = platform_get_resource(pdev, IORESOURCE_MEM, 0); 1109 res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
1110 if (IS_ERR(res)) { 1110 if (!res) {
1111 dev_err(&pdev->dev, "could not determine device resources\n"); 1111 dev_err(&pdev->dev, "could not determine device resources\n");
1112 return PTR_ERR(res); 1112 return -ENXIO;
1113 } 1113 }
1114 1114
1115 regs = devm_ioremap_resource(&pdev->dev, res); 1115 regs = devm_ioremap_resource(&pdev->dev, res);