Merge tag 'driver-core-3.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git...

[linux-2.6-block.git] / sound / soc / ux500 / mop500.c

diff --git a/sound/soc/ux500/mop500.c b/sound/soc/ux500/mop500.c
index 2ba0d42b108f2a15808569cfd1f63cbb2452762a..4e0c0e502ade2c228a00db3a44c44ecfa4c9978d 100644 (file)
--- a/sound/soc/ux500/mop500.c
+++ b/sound/soc/ux500/mop500.c
@@ -63,12 +63,8 @@ static void mop500_of_node_put(void)
        int i;
 
        for (i = 0; i < 2; i++) {
-               if (mop500_dai_links[i].cpu_of_node)
-                       of_node_put((struct device_node *)
-                               mop500_dai_links[i].cpu_of_node);
-               if (mop500_dai_links[i].codec_of_node)
-                       of_node_put((struct device_node *)
-                               mop500_dai_links[i].codec_of_node);
+               of_node_put(mop500_dai_links[i].cpu_of_node);
+               of_node_put(mop500_dai_links[i].codec_of_node);
        }
 }