LinuxLists.cc - [PATCH] drm/bridge: Fix error handling in analogix_dp

2022-04-04 22:52:11

Subject: [PATCH] drm/bridge: Fix error handling in analogix_dp_probe

In the error handling path, the clk_prepare_enable() function
call should be balanced by a corresponding 'clk_disable_unprepare()'
call , as already done in the remove function.

Fixes: 3424e3a4f844 ("drm: bridge: analogix/dp: split exynos dp driver to bridge directory")
Signed-off-by: Miaoqian Lin <[email protected]>
---
.../gpu/drm/bridge/analogix/analogix_dp_core.c | 17 +++++++++++++----
1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c b/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c
index eb590fb8e8d0..2c0f582b4d32 100644
--- a/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c
+++ b/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c
@@ -1698,7 +1698,10 @@ analogix_dp_probe(struct device *dev, struct analogix_dp_plat_data *plat_data)
res = platform_get_resource(pdev, IORESOURCE_MEM, 0);

dp->reg_base = devm_ioremap_resource(&pdev->dev, res);
- if (IS_ERR(dp->reg_base))
+ if (IS_ERR(dp->reg_base)) {
+ ret = PTR_ERR(dp->reg_base);
+ goto err_disable_clk;
+ }
return ERR_CAST(dp->reg_base);

dp->force_hpd = of_property_read_bool(dev->of_node, "force-hpd");
@@ -1711,7 +1714,8 @@ analogix_dp_probe(struct device *dev, struct analogix_dp_plat_data *plat_data)
if (IS_ERR(dp->hpd_gpiod)) {
dev_err(dev, "error getting HDP GPIO: %ld\n",
PTR_ERR(dp->hpd_gpiod));
- return ERR_CAST(dp->hpd_gpiod);
+ ret = PTR_ERR(dp->hpd_gpiod);
+ goto err_disable_clk;
}

if (dp->hpd_gpiod) {
@@ -1731,7 +1735,8 @@ analogix_dp_probe(struct device *dev, struct analogix_dp_plat_data *plat_data)

if (dp->irq == -ENXIO) {
dev_err(&pdev->dev, "failed to get irq\n");
- return ERR_PTR(-ENODEV);
+ ret = -ENODEV;
+ goto err_disable_clk;
}

ret = devm_request_threaded_irq(&pdev->dev, dp->irq,
@@ -1740,11 +1745,15 @@ analogix_dp_probe(struct device *dev, struct analogix_dp_plat_data *plat_data)
irq_flags, "analogix-dp", dp);
if (ret) {
dev_err(&pdev->dev, "failed to request irq\n");
- return ERR_PTR(ret);
+ goto err_disable_clk;
}
disable_irq(dp->irq);

return dp;
+
+err_disable_clk:
+ clk_disable_unprepare(dp->clock);
+ return ERR_PTR(ret);
}
EXPORT_SYMBOL_GPL(analogix_dp_probe);

--
2.17.1

2022-04-05 01:28:01

by kernel test robot

[permalink] [raw]

Subject: Re: [PATCH] drm/bridge: Fix error handling in analogix_dp_probe

Hi Miaoqian,

Thank you for the
[auto build test [also build test [If your patch is And when submitting If you fix the issue, Reported-by: kernel
New smatch warnings:
drivers/gpu/drm/bridge/an drivers/gpu/drm/bridge/an drivers/gpu/drm/bridge/an
Old smatch warnings:
drivers/gpu/drm/bridge/an
vim +1705 drivers/gpu/drm
0d97ad03f4220c Tomeu Vizoso 6b2d8fd98d051f Jeffy Chen 152cce0006abf7 Marek 3424e3a4f844c0 Yakir Yang 3424e3a4f844c0 Yakir Yang 3424e3a4f844c0 Yakir Yang 3424e3a4f844c0 Yakir Yang 3424e3a4f844c0 Yakir Yang 3424e3a4f844c0 Yakir Yang 3424e3a4f844c0 Yakir Yang 3424e3a4f844c0 Yakir Yang 3424e3a4f844c0 Yakir Yang 6b2d8fd98d051f Jeffy Chen 3424e3a4f844c0 Yakir Yang 3424e3a4f844c0 Yakir Yang 3424e3a4f844c0 Yakir Yang 3424e3a4f844c0 Yakir Yang 6b2d8fd98d051f Jeffy Chen 3424e3a4f844c0 Yakir Yang 3424e3a4f844c0 Yakir Yang 3424e3a4f844c0 Yakir Yang 3424e3a4f844c0 Yakir Yang 0b8b059a75b08f Sean Paul 0b8b059a75b08f Sean Paul 0b8b059a75b08f Sean Paul 3424e3a4f844c0 Yakir Yang 3424e3a4f844c0 Yakir Yang 3424e3a4f844c0 Yakir Yang 3424e3a4f844c0 Yakir Yang 3424e3a4f844c0 Yakir Yang 3424e3a4f844c0 Yakir Yang 3424e3a4f844c0 Yakir Yang 793ce4eb84ea2f Yakir Yang 793ce4eb84ea2f Yakir Yang 6b2d8fd98d051f Jeffy Chen 3424e3a4f844c0 Yakir Yang 3424e3a4f844c0 Yakir Yang 3424e3a4f844c0 Yakir Yang 3424e3a4f844c0 Yakir Yang 3424e3a4f844c0 Yakir Yang 3424e3a4f844c0 Yakir Yang 3424e3a4f844c0 Yakir Yang 3424e3a4f844c0 Yakir Yang 3424e3a4f844c0 Yakir Yang 3424e3a4f844c0 Yakir Yang 3424e3a4f844c0 Yakir Yang 3424e3a4f844c0 Yakir Yang 3424e3a4f844c0 Yakir Yang 6b2d8fd98d051f Jeffy Chen 3424e3a4f844c0 Yakir Yang 3424e3a4f844c0 Yakir Yang 3424e3a4f844c0 Yakir Yang 3424e3a4f844c0 Yakir Yang 3424e3a4f844c0 Yakir Yang 3424e3a4f844c0 Yakir Yang 6b2d8fd98d051f Jeffy Chen 3424e3a4f844c0 Yakir Yang 3424e3a4f844c0 Yakir Yang 3424e3a4f844c0 Yakir Yang 3424e3a4f844c0 Yakir Yang 3424e3a4f844c0 Yakir Yang 3424e3a4f844c0 Yakir Yang 3424e3a4f844c0 Yakir Yang af6df465625fb3 Miaoqian Lin af6df465625fb3 Miaoqian Lin af6df465625fb3 Miaoqian Lin af6df465625fb3 Miaoqian Lin 6b2d8fd98d051f Jeffy Chen 3424e3a4f844c0 Yakir Yang 5cff007c58b710 Yakir Yang 5cff007c58b710 Yakir Yang 5b038dcf9d0aa0 Linus Walleij 5b038dcf9d0aa0 Linus Walleij 5b038dcf9d0aa0 Linus Walleij 5b038dcf9d0aa0 Linus Walleij 5b038dcf9d0aa0 Linus Walleij 5b038dcf9d0aa0 Linus Walleij 5b038dcf9d0aa0 Linus Walleij 5b038dcf9d0aa0 Linus Walleij af6df465625fb3 Miaoqian Lin af6df465625fb3 Miaoqian Lin 5b038dcf9d0aa0 Linus Walleij 3424e3a4f844c0 Yakir Yang 5b038dcf9d0aa0 Linus Walleij 3424e3a4f844c0 Yakir Yang 3424e3a4f844c0 Yakir Yang 3424e3a4f844c0 Yakir Yang 3424e3a4f844c0 Yakir Yang 3424e3a4f844c0 Yakir Yang 3424e3a4f844c0 Yakir Yang 3424e3a4f844c0 Yakir Yang 5b038dcf9d0aa0 Linus Walleij 3424e3a4f844c0 Yakir Yang 3424e3a4f844c0 Yakir Yang 3424e3a4f844c0 Yakir Yang 3424e3a4f844c0 Yakir Yang 3424e3a4f844c0 Yakir Yang 3424e3a4f844c0 Yakir Yang 3424e3a4f844c0 Yakir Yang 3424e3a4f844c0 Yakir Yang af6df465625fb3 Miaoqian Lin af6df465625fb3 Miaoqian Lin 3424e3a4f844c0 Yakir Yang 3424e3a4f844c0 Yakir Yang 7b4b7a8db439dc Yakir Yang 7b4b7a8db439dc Yakir Yang 7b4b7a8db439dc Yakir Yang 3424e3a4f844c0 Yakir Yang 3424e3a4f844c0 Yakir Yang 3424e3a4f844c0 Yakir Yang af6df465625fb3 Miaoqian Lin 3424e3a4f844c0 Yakir Yang 3424e3a4f844c0 Yakir Yang 3424e3a4f844c0 Yakir Yang 152cce0006abf7 Marek af6df465625fb3 Miaoqian Lin af6df465625fb3 Miaoqian Lin af6df465625fb3 Miaoqian Lin af6df465625fb3 Miaoqian Lin 152cce0006abf7 Marek 152cce0006abf7 Marek 152cce0006abf7 Marek
--
0-DAY CI Kernel Test Service
https://git-scm.com/docs/git-format-patch]
/github.com/intel-lab-lkp/linux/commits/Miaoqian-Lin/drm-bridge-Fix-error-handling-in-analogix_dp_probe/20220403-131916">https://github.com/intel-lab-lkp/linux/commits/Miaoqian-Lin/drm-bridge-Fix-error-handling-in-analogix_dp_probe/20220403-131916
edesktop.org/drm/drm drm-next
href="https://download.01.org/0day-ci/archive/20220403/202204031935.5SkYsM2M-lkp@intel.com/config)">https://download.01.org/0day-ci/archive/20220403/[email protected]/config)
(Debian 11.2.0-19) 11.2.0
kindly add following tag as appropriate
test robot <[email protected]>
alogix/analogix_dp_core.c:1705 analogix_dp_probe() warn: inconsistent indenting
alogix/analogix_dp_core.c:1705 analogix_dp_probe() warn: passing zero to 'ERR_CAST'
alogix/analogix_dp_core.c:1707 analogix_dp_probe() warn: ignoring unreachable code.
alogix/analogix_dp_core.c:1846 analogix_dp_resume() warn: 'dp->clock' from clk_prepare_enable() not released on lines: 1842.
/bridge/analogix/analogix_dp_core.c
2016-08-24 1638
2018-01-10 1639 struct analogix_dp_device *
Szyprowski 2020-03-10 1640 analogix_dp_probe(struct device *dev, struct analogix_dp_plat_data *plat_data)
2016-03-29 1641 {
2016-03-29 1642 struct platform_device *pdev = to_platform_device(dev);
2016-03-29 1643 struct analogix_dp_device *dp;
2016-03-29 1644 struct resource *res;
2016-03-29 1645 unsigned int irq_flags;
2016-03-29 1646 int ret;
2016-03-29 1647
2016-03-29 1648 if (!plat_data) {
2016-03-29 1649 dev_err(dev, "Invalided input plat_data\n");
2018-01-10 1650 return ERR_PTR(-EINVAL);
2016-03-29 1651 }
2016-03-29 1652
2016-03-29 1653 dp = devm_kzalloc(dev, sizeof(struct analogix_dp_device), GFP_KERNEL);
2016-03-29 1654 if (!dp)
2018-01-10 1655 return ERR_PTR(-ENOMEM);
2016-03-29 1656
2016-03-29 1657 dp->dev = &pdev->dev;
2016-03-29 1658 dp->dpms_mode = DRM_MODE_DPMS_OFF;
2016-03-29 1659
2016-08-08 1660 mutex_init(&dp->panel_lock);
2016-08-08 1661 dp->panel_is_modeset = false;
2016-08-08 1662
2016-03-29 1663 /*
2016-03-29 1664 * platform dp driver need containor_of the plat_data to get
2016-03-29 1665 * the driver private data, so we need to store the point of
2016-03-29 1666 * plat_data, not the context of plat_data.
2016-03-29 1667 */
2016-03-29 1668 dp->plat_data = plat_data;
2016-03-29 1669
2016-02-15 1670 ret = analogix_dp_dt_parse_pdata(dp);
2016-02-15 1671 if (ret)
2018-01-10 1672 return ERR_PTR(ret);
2016-03-29 1673
2016-03-29 1674 dp->phy = devm_phy_get(dp->dev, "dp");
2016-03-29 1675 if (IS_ERR(dp->phy)) {
2016-03-29 1676 dev_err(dp->dev, "no DP phy configured\n");
2016-03-29 1677 ret = PTR_ERR(dp->phy);
2016-03-29 1678 if (ret) {
2016-03-29 1679 /*
2016-03-29 1680 * phy itself is not enabled, so we can move forward
2016-03-29 1681 * assigning NULL to phy pointer.
2016-03-29 1682 */
2016-03-29 1683 if (ret == -ENOSYS || ret == -ENODEV)
2016-03-29 1684 dp->phy = NULL;
2016-03-29 1685 else
2018-01-10 1686 return ERR_PTR(ret);
2016-03-29 1687 }
2016-03-29 1688 }
2016-03-29 1689
2016-03-29 1690 dp->clock = devm_clk_get(&pdev->dev, "dp");
2016-03-29 1691 if (IS_ERR(dp->clock)) {
2016-03-29 1692 dev_err(&pdev->dev, "failed to get clock\n");
2018-01-10 1693 return ERR_CAST(dp->clock);
2016-03-29 1694 }
2016-03-29 1695
2016-03-29 1696 clk_prepare_enable(dp->clock);
2016-03-29 1697
2016-03-29 1698 res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
2016-03-29 1699
2016-03-29 1700 dp->reg_base = devm_ioremap_resource(&pdev->dev, res);
2022-04-03 1701 if (IS_ERR(dp->reg_base)) {
2022-04-03 1702 ret = PTR_ERR(dp->reg_base);
2022-04-03 1703 goto err_disable_clk;
2022-04-03 1704 }
2018-01-10 @1705 return ERR_CAST(dp->reg_base);
2016-03-29 1706
2016-02-15 @1707 dp->force_hpd = of_property_read_bool(dev->of_node, "force-hpd");
2016-02-15 1708
2019-06-10 1709 /* Try two different names */
2019-06-10 1710 dp->hpd_gpiod = devm_gpiod_get_optional(dev, "hpd", GPIOD_IN);
2019-06-10 1711 if (!dp->hpd_gpiod)
2019-06-10 1712 dp->hpd_gpiod = devm_gpiod_get_optional(dev, "samsung,hpd",
2019-06-10 1713 GPIOD_IN);
2019-06-10 1714 if (IS_ERR(dp->hpd_gpiod)) {
2019-06-10 1715 dev_err(dev, "error getting HDP GPIO: %ld\n",
2019-06-10 1716 PTR_ERR(dp->hpd_gpiod));
2022-04-03 1717 ret = PTR_ERR(dp->hpd_gpiod);
2022-04-03 1718 goto err_disable_clk;
2019-06-10 1719 }
2016-03-29 1720
2019-06-10 1721 if (dp->hpd_gpiod) {
2016-03-29 1722 /*
2016-03-29 1723 * Set up the hotplug GPIO from the device tree as an interrupt.
2016-03-29 1724 * Simply specifying a different interrupt in the device tree
2016-03-29 1725 * doesn't work since we handle hotplug rather differently when
2016-03-29 1726 * using a GPIO. We also need the actual GPIO specifier so
2016-03-29 1727 * that we can get the current state of the GPIO.
2016-03-29 1728 */
2019-06-10 1729 dp->irq = gpiod_to_irq(dp->hpd_gpiod);
2016-03-29 1730 irq_flags = IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING;
2016-03-29 1731 } else {
2016-03-29 1732 dp->irq = platform_get_irq(pdev, 0);
2016-03-29 1733 irq_flags = 0;
2016-03-29 1734 }
2016-03-29 1735
2016-03-29 1736 if (dp->irq == -ENXIO) {
2016-03-29 1737 dev_err(&pdev->dev, "failed to get irq\n");
2022-04-03 1738 ret = -ENODEV;
2022-04-03 1739 goto err_disable_clk;
2016-03-29 1740 }
2016-03-29 1741
2016-02-15 1742 ret = devm_request_threaded_irq(&pdev->dev, dp->irq,
2016-02-15 1743 analogix_dp_hardirq,
2016-02-15 1744 analogix_dp_irq_thread,
2016-03-29 1745 irq_flags, "analogix-dp", dp);
2016-03-29 1746 if (ret) {
2016-03-29 1747 dev_err(&pdev->dev, "failed to request irq\n");
2022-04-03 1748 goto err_disable_clk;
2016-03-29 1749 }
2016-03-29 1750 disable_irq(dp->irq);
2016-03-29 1751
Szyprowski 2020-03-10 1752 return dp;
2022-04-03 1753
2022-04-03 1754 err_disable_clk:
2022-04-03 1755 clk_disable_unprepare(dp->clock);
2022-04-03 1756 return ERR_PTR(ret);
Szyprowski 2020-03-10 1757 }
Szyprowski 2020-03-10 1758 EXPORT_SYMBOL_GPL(analogix_dp_probe);
Szyprowski 2020-03-10 1759
lkp">https://01.org/lkp

2022-04-22 18:47:00

by Miaoqian Lin

[permalink] [raw]

Subject: [PATCH v2] drm/bridge: Fix error handling in analogix_dp_probe

In the error handling path, the clk_prepare_enable() function
call should be balanced by a corresponding 'clk_disable_unprepare()'
call , as already done in the remove function.

Fixes: 3424e3a4f844 ("drm: bridge: analogix/dp: split exynos dp driver to bridge directory")
Signed-off-by: Miaoqian Lin <[email protected]>
---
changes in v2:
- remove the wrong return statement.
---
.../gpu/drm/bridge/analogix/analogix_dp_core.c | 18 +++++++++++++-----
1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c b/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c
index eb590fb8e8d0..474ef88015ae 100644
--- a/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c
+++ b/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c
@@ -1698,8 +1698,10 @@ analogix_dp_probe(struct device *dev, struct analogix_dp_plat_data *plat_data)
res = platform_get_resource(pdev, IORESOURCE_MEM, 0);

dp->reg_base = devm_ioremap_resource(&pdev->dev, res);
- if (IS_ERR(dp->reg_base))
- return ERR_CAST(dp->reg_base);
+ if (IS_ERR(dp->reg_base)) {
+ ret = PTR_ERR(dp->reg_base);
+ goto err_disable_clk;
+ }

dp->force_hpd = of_property_read_bool(dev->of_node, "force-hpd");

@@ -1711,7 +1713,8 @@ analogix_dp_probe(struct device *dev, struct analogix_dp_plat_data *plat_data)
if (IS_ERR(dp->hpd_gpiod)) {
dev_err(dev, "error getting HDP GPIO: %ld\n",
PTR_ERR(dp->hpd_gpiod));
- return ERR_CAST(dp->hpd_gpiod);
+ ret = PTR_ERR(dp->hpd_gpiod);
+ goto err_disable_clk;
}

if (dp->hpd_gpiod) {
@@ -1731,7 +1734,8 @@ analogix_dp_probe(struct device *dev, struct analogix_dp_plat_data *plat_data)

if (dp->irq == -ENXIO) {
dev_err(&pdev->dev, "failed to get irq\n");
- return ERR_PTR(-ENODEV);
+ ret = -ENODEV;
+ goto err_disable_clk;
}

ret = devm_request_threaded_irq(&pdev->dev, dp->irq,
@@ -1740,11 +1744,15 @@ analogix_dp_probe(struct device *dev, struct analogix_dp_plat_data *plat_data)
irq_flags, "analogix-dp", dp);
if (ret) {
dev_err(&pdev->dev, "failed to request irq\n");
- return ERR_PTR(ret);
+ goto err_disable_clk;
}
disable_irq(dp->irq);

return dp;
+
+err_disable_clk:
+ clk_disable_unprepare(dp->clock);
+ return ERR_PTR(ret);
}
EXPORT_SYMBOL_GPL(analogix_dp_probe);

--
2.17.1

2022-04-22 19:09:42

by Robert Foss

[permalink] [raw]

Subject: Re: [PATCH v2] drm/bridge: Fix error handling in analogix_dp_probe

On Wed, 20 Apr 2022 at 03:16, Miaoqian Lin <[email protected]> wrote:
>
> In the error handling path, the clk_prepare_enable() function
> call should be balanced by a corresponding 'clk_disable_unprepare()'
> call , as already done in the remove function.
>
> Fixes: 3424e3a4f844 ("drm: bridge: analogix/dp: split exynos dp driver to bridge directory")
> Signed-off-by: Miaoqian Lin <[email protected]>
> ---
> changes in v2:
> - remove the wrong return statement.
> ---
> .../gpu/drm/bridge/analogix/analogix_dp_core.c | 18 +++++++++++++-----
> 1 file changed, 13 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c b/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c
> index eb590fb8e8d0..474ef88015ae 100644
> --- a/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c
> +++ b/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c
> @@ -1698,8 +1698,10 @@ analogix_dp_probe(struct device *dev, struct analogix_dp_plat_data *plat_data)
> res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
>
> dp->reg_base = devm_ioremap_resource(&pdev->dev, res);
> - if (IS_ERR(dp->reg_base))
> - return ERR_CAST(dp->reg_base);
> + if (IS_ERR(dp->reg_base)) {
> + ret = PTR_ERR(dp->reg_base);
> + goto err_disable_clk;
> + }
>
> dp->force_hpd = of_property_read_bool(dev->of_node, "force-hpd");
>
> @@ -1711,7 +1713,8 @@ analogix_dp_probe(struct device *dev, struct analogix_dp_plat_data *plat_data)
> if (IS_ERR(dp->hpd_gpiod)) {
> dev_err(dev, "error getting HDP GPIO: %ld\n",
> PTR_ERR(dp->hpd_gpiod));
> - return ERR_CAST(dp->hpd_gpiod);
> + ret = PTR_ERR(dp->hpd_gpiod);
> + goto err_disable_clk;
> }
>
> if (dp->hpd_gpiod) {
> @@ -1731,7 +1734,8 @@ analogix_dp_probe(struct device *dev, struct analogix_dp_plat_data *plat_data)
>
> if (dp->irq == -ENXIO) {
> dev_err(&pdev->dev, "failed to get irq\n");
> - return ERR_PTR(-ENODEV);
> + ret = -ENODEV;
> + goto err_disable_clk;
> }
>
> ret = devm_request_threaded_irq(&pdev->dev, dp->irq,
> @@ -1740,11 +1744,15 @@ analogix_dp_probe(struct device *dev, struct analogix_dp_plat_data *plat_data)
> irq_flags, "analogix-dp", dp);
> if (ret) {
> dev_err(&pdev->dev, "failed to request irq\n");
> - return ERR_PTR(ret);
> + goto err_disable_clk;
> }
> disable_irq(dp->irq);
>
> return dp;
> +
> +err_disable_clk:
> + clk_disable_unprepare(dp->clock);
> + return ERR_PTR(ret);
> }
> EXPORT_SYMBOL_GPL(analogix_dp_probe);
>

Reviewed-by: Robert Foss <[email protected]>

Applied to drm-misc-next.