Merge remote-tracking branch 'asoc/fix/wm8962' into asoc-linus

[sfrench/cifs-2.6.git] / sound / soc / fsl / fsl_spdif.c

diff --git a/sound/soc/fsl/fsl_spdif.c b/sound/soc/fsl/fsl_spdif.c
index ff1f34766ee394119001f9bb417dbe3bf25d9ea3..76c742a09ef997a9c6a6d8386522e1a9d490c613 100644 (file)
--- 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)
 
        /* Get the addresses and IRQ */
        res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-       if (IS_ERR(res)) {
+       if (!res) {
                dev_err(&pdev->dev, "could not determine device resources\n");
-               return PTR_ERR(res);
+               return -ENXIO;
        }
 
        regs = devm_ioremap_resource(&pdev->dev, res);