aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJingoo Han <jg1.han@samsung.com>2013-02-21 19:42:37 -0500
committerLinus Torvalds <torvalds@linux-foundation.org>2013-02-21 20:22:18 -0500
commitd3ed97035b2ed8be0c67768ca7e050547d860ca5 (patch)
tree9dee10feb01abfcc5a9eea4d77667a876f5b8d4c
parent678268e534553546508ae5bf066c8a491047a6f6 (diff)
video: exynos_dp: add missing of_node_put()
of_find_node_by_name() returns a node pointer with refcount incremented, use of_node_put() on it when done. of_find_node_by_name() will call of_node_put() against the node pass to from parameter, thus we also need to call of_node_get(from) before calling of_find_node_by_name(). Signed-off-by: Jingoo Han <jg1.han@samsung.com> Cc: Florian Tobias Schandinat <FlorianSchandinat@gmx.de> Cc: Ajay Kumar <ajaykumar.rs@samsung.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--drivers/video/exynos/exynos_dp_core.c19
1 files changed, 13 insertions, 6 deletions
diff --git a/drivers/video/exynos/exynos_dp_core.c b/drivers/video/exynos/exynos_dp_core.c
index 2d0d144add1b..68385a05cee6 100644
--- a/drivers/video/exynos/exynos_dp_core.c
+++ b/drivers/video/exynos/exynos_dp_core.c
@@ -965,10 +965,11 @@ static struct exynos_dp_platdata *exynos_dp_dt_parse_pdata(struct device *dev)
965 965
966static int exynos_dp_dt_parse_phydata(struct exynos_dp_device *dp) 966static int exynos_dp_dt_parse_phydata(struct exynos_dp_device *dp)
967{ 967{
968 struct device_node *dp_phy_node; 968 struct device_node *dp_phy_node = of_node_get(dp->dev->of_node);
969 u32 phy_base; 969 u32 phy_base;
970 int ret = 0;
970 971
971 dp_phy_node = of_find_node_by_name(dp->dev->of_node, "dptx-phy"); 972 dp_phy_node = of_find_node_by_name(dp_phy_node, "dptx-phy");
972 if (!dp_phy_node) { 973 if (!dp_phy_node) {
973 dev_err(dp->dev, "could not find dptx-phy node\n"); 974 dev_err(dp->dev, "could not find dptx-phy node\n");
974 return -ENODEV; 975 return -ENODEV;
@@ -976,22 +977,28 @@ static int exynos_dp_dt_parse_phydata(struct exynos_dp_device *dp)
976 977
977 if (of_property_read_u32(dp_phy_node, "reg", &phy_base)) { 978 if (of_property_read_u32(dp_phy_node, "reg", &phy_base)) {
978 dev_err(dp->dev, "faild to get reg for dptx-phy\n"); 979 dev_err(dp->dev, "faild to get reg for dptx-phy\n");
979 return -EINVAL; 980 ret = -EINVAL;
981 goto err;
980 } 982 }
981 983
982 if (of_property_read_u32(dp_phy_node, "samsung,enable-mask", 984 if (of_property_read_u32(dp_phy_node, "samsung,enable-mask",
983 &dp->enable_mask)) { 985 &dp->enable_mask)) {
984 dev_err(dp->dev, "faild to get enable-mask for dptx-phy\n"); 986 dev_err(dp->dev, "faild to get enable-mask for dptx-phy\n");
985 return -EINVAL; 987 ret = -EINVAL;
988 goto err;
986 } 989 }
987 990
988 dp->phy_addr = ioremap(phy_base, SZ_4); 991 dp->phy_addr = ioremap(phy_base, SZ_4);
989 if (!dp->phy_addr) { 992 if (!dp->phy_addr) {
990 dev_err(dp->dev, "failed to ioremap dp-phy\n"); 993 dev_err(dp->dev, "failed to ioremap dp-phy\n");
991 return -ENOMEM; 994 ret = -ENOMEM;
995 goto err;
992 } 996 }
993 997
994 return 0; 998err:
999 of_node_put(dp_phy_node);
1000
1001 return ret;
995} 1002}
996 1003
997static void exynos_dp_phy_init(struct exynos_dp_device *dp) 1004static void exynos_dp_phy_init(struct exynos_dp_device *dp)