Merge tag 'dt-for-3.7' of git://sources.calxeda.com/kernel/linux

[~andy/linux] / drivers / spi / spi-s3c64xx.c

diff --git a/drivers/spi/spi-s3c64xx.c b/drivers/spi/spi-s3c64xx.c
index 1860c3aca7e29271a75e12b392a49f8a24fcd813..1a81c90a4a71dc69ce4ec459342a98af3d26b872 100644 (file)
--- a/drivers/spi/spi-s3c64xx.c
+++ b/drivers/spi/spi-s3c64xx.c
@@ -835,9 +835,7 @@ static struct s3c64xx_spi_csinfo *s3c64xx_get_slave_ctrldata(
                return ERR_PTR(-EINVAL);
        }
 
-       for_each_child_of_node(slave_np, data_np)
-               if (!strcmp(data_np->name, "controller-data"))
-                       break;
+       data_np = of_get_child_by_name(slave_np, "controller-data");
        if (!data_np) {
                dev_err(&spi->dev, "child node 'controller-data' not found\n");
                return ERR_PTR(-EINVAL);
@@ -847,6 +845,7 @@ static struct s3c64xx_spi_csinfo *s3c64xx_get_slave_ctrldata(
        if (!cs) {
                dev_err(&spi->dev, "could not allocate memory for controller"
                                        " data\n");
+               of_node_put(data_np);
                return ERR_PTR(-ENOMEM);
        }
 
@@ -855,11 +854,13 @@ static struct s3c64xx_spi_csinfo *s3c64xx_get_slave_ctrldata(
                dev_err(&spi->dev, "chip select gpio is not specified or "
                                        "invalid\n");
                kfree(cs);
+               of_node_put(data_np);
                return ERR_PTR(-EINVAL);
        }
 
        of_property_read_u32(data_np, "samsung,spi-feedback-delay", &fb_delay);
        cs->fb_delay = fb_delay;
+       of_node_put(data_np);
        return cs;
 }