Merge branch 'for-linus-4.2' of git://git.kernel.org/pub/scm/linux/kernel/git/mason...

[deliverable/linux.git] / sound / soc / fsl / fsl_ssi.c

diff --git a/sound/soc/fsl/fsl_ssi.c b/sound/soc/fsl/fsl_ssi.c
index 0d48804218b1bdbc31198fbb6b0ce16bc09a4fc3..c7647e066cfd76b07f6b1acd4d2a68ac04bae3bc 100644 (file)
--- a/sound/soc/fsl/fsl_ssi.c
+++ b/sound/soc/fsl/fsl_ssi.c
@@ -1292,13 +1292,6 @@ static int fsl_ssi_probe(struct platform_device *pdev)
        void __iomem *iomem;
        char name[64];
 
-       /* SSIs that are not connected on the board should have a
-        *      status = "disabled"
-        * property in their device tree nodes.
-        */
-       if (!of_device_is_available(np))
-               return -ENODEV;
-
        of_id = of_match_device(fsl_ssi_ids, &pdev->dev);
        if (!of_id || !of_id->data)
                return -EINVAL;