1 files changed, 10 insertions, 8 deletions

diff --git a/drivers/spi/spi-s3c64xx.c b/drivers/spi/spi-s3c64xx.c
index 0e2a02228d5e..1a81c90a4a71 100644
--- 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;
 }
 
@@ -976,7 +977,8 @@ err_msgq:
         spi_set_ctldata(spi, NULL);
 
 err_gpio_req:
-        kfree(cs);
+        if (spi->dev.of_node)
+                kfree(cs);
 
         return err;
 }
@@ -1409,7 +1411,7 @@ static int s3c64xx_spi_remove(struct platform_device *pdev)
 #ifdef CONFIG_PM
 static int s3c64xx_spi_suspend(struct device *dev)
 {
-        struct spi_master *master = spi_master_get(dev_get_drvdata(dev));
+        struct spi_master *master = dev_get_drvdata(dev);
         struct s3c64xx_spi_driver_data *sdd = spi_master_get_devdata(master);
 
         spi_master_suspend(master);
@@ -1428,7 +1430,7 @@ static int s3c64xx_spi_suspend(struct device *dev)
 
 static int s3c64xx_spi_resume(struct device *dev)
 {
-        struct spi_master *master = spi_master_get(dev_get_drvdata(dev));
+        struct spi_master *master = dev_get_drvdata(dev);
         struct s3c64xx_spi_driver_data *sdd = spi_master_get_devdata(master);
         struct s3c64xx_spi_info *sci = sdd->cntrlr_info;
 
@@ -1452,7 +1454,7 @@ static int s3c64xx_spi_resume(struct device *dev)
 #ifdef CONFIG_PM_RUNTIME
 static int s3c64xx_spi_runtime_suspend(struct device *dev)
 {
-        struct spi_master *master = spi_master_get(dev_get_drvdata(dev));
+        struct spi_master *master = dev_get_drvdata(dev);
         struct s3c64xx_spi_driver_data *sdd = spi_master_get_devdata(master);
 
         clk_disable(sdd->clk);
@@ -1463,7 +1465,7 @@ static int s3c64xx_spi_runtime_suspend(struct device *dev)
 
 static int s3c64xx_spi_runtime_resume(struct device *dev)
 {
-        struct spi_master *master = spi_master_get(dev_get_drvdata(dev));
+        struct spi_master *master = dev_get_drvdata(dev);
         struct s3c64xx_spi_driver_data *sdd = spi_master_get_devdata(master);
 
         clk_enable(sdd->src_clk);