video: exynos_dp: add missing of_node_put()
Subsystems (2)
PATCH RESEND 1/2 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 <[email protected]>
--- drivers/video/exynos/exynos_dp_core.c | 19 +++++++++++++------ 1 files changed, 13 insertions(+), 6 deletions(-)
drivers/video/exynos/exynos_dp_core.c +13 -6
@@ -965,10 +965,11 @@ static struct exynos_dp_platdata *exynos_dp_dt_parse_pdata(struct device *dev)static int exynos_dp_dt_parse_phydata (struct exynos_dp_device *dp) { -struct device_node *dp_phy_node; +struct device_node *dp_phy_node =of_node_get (dp->dev->of_node);u32 phy_base; +int ret =0 ; - dp_phy_node =of_find_node_by_name (dp->dev->of_node,"dptx-phy" ); + dp_phy_node =of_find_node_by_name (dp_phy_node,"dptx-phy" );if (!dp_phy_node) {dev_err (dp->dev,"could not find dptx-phy node\n" );return -ENODEV ;
@@ -976,22 +977,28 @@ static int exynos_dp_dt_parse_phydata(struct exynos_dp_device *dp)if (of_property_read_u32 (dp_phy_node,"reg" , &phy_base)) {dev_err (dp->dev,"faild to get reg for dptx-phy\n" ); -return -EINVAL ; + ret = -EINVAL ; + goto err; }if (of_property_read_u32 (dp_phy_node,"samsung,enable-mask" , &dp->enable_mask)) {dev_err (dp->dev,"faild to get enable-mask for dptx-phy\n" ); -return -EINVAL ; + ret = -EINVAL ; + goto err; } dp->phy_addr =ioremap (phy_base,SZ_4 );if (!dp->phy_addr) {dev_err (dp->dev,"failed to ioremap dp-phy\n" ); -return -ENOMEM ; + ret = -ENOMEM ; + goto err; } -return 0 ; +err: +of_node_put (dp_phy_node); + +return ret; }static void exynos_dp_phy_init (struct exynos_dp_device *dp)
Signature · 1 line
1.7.2.5
PATCH RESEND 2/2 video: exynos_dp: move disable_irq() to exynos_dp_suspend()
From: Ajay Kumar <[email protected]>
disable_irq() should be moved to exynos_dp_suspend(), because enable_irq() is called at exynos_dp_resume().
Signed-off-by Ajay Kumar <[email protected]>
Signed-off-by Jingoo Han <[email protected]>
--- drivers/video/exynos/exynos_dp_core.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)
drivers/video/exynos/exynos_dp_core.c +2 -2
@@ -1124,8 +1124,6 @@ static int exynos_dp_remove(struct platform_device *pdev)struct exynos_dp_platdata *pdata = pdev->dev.platform_data;struct exynos_dp_device *dp =platform_get_drvdata (pdev); -disable_irq (dp->irq); -flush_work (&dp->hotplug_work);if (pdev->dev.of_node) {
@@ -1148,6 +1146,8 @@ static int exynos_dp_suspend(struct device *dev)struct exynos_dp_platdata *pdata = dev->platform_data;struct exynos_dp_device *dp =dev_get_drvdata (dev); +disable_irq (dp->irq); +flush_work (&dp->hotplug_work);if (dev->of_node) {
Signature · 1 line
1.7.2.5