| Message ID | 20220121100039.17316-1-m.szyprowski@samsung.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 8e3fa9d841db7517c1dcc365a911eaeacee09f20 |
| Headers | show |
| Series | drm/exynos: Don't fail if no TE-gpio is defined for DSI driver | expand |
Hi Marek, Thanks for fixing it. Inki Dae. 22. 1. 21. 19:00에 Marek Szyprowski 이(가) 쓴 글: > TE-gpio is optional and if it is not found then gpiod_get_optional() > returns NULL. In such case the code will continue and try to convert NULL > gpiod to irq what in turn fails. The failure is then propagated and driver > is not registered. > > Fix this by returning early from exynos_dsi_register_te_irq() if no > TE-gpio is found. > > Fixes: ee6c8b5afa62 ("drm/exynos: Replace legacy gpio interface for gpiod interface") > Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com> --- > drivers/gpu/drm/exynos/exynos_drm_dsi.c | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/exynos/exynos_drm_dsi.c b/drivers/gpu/drm/exynos/exynos_drm_dsi.c > index 32a36572b894..14ebbb124852 100644 > --- a/drivers/gpu/drm/exynos/exynos_drm_dsi.c > +++ b/drivers/gpu/drm/exynos/exynos_drm_dsi.c > @@ -1335,7 +1335,9 @@ static int exynos_dsi_register_te_irq(struct exynos_dsi *dsi, > int te_gpio_irq; > > dsi->te_gpio = devm_gpiod_get_optional(dsi->dev, "te", GPIOD_IN); > - if (IS_ERR(dsi->te_gpio)) { > + if (!dsi->te_gpio) { > + return 0; > + } else if (IS_ERR(dsi->te_gpio)) { > dev_err(dsi->dev, "gpio request failed with %ld\n", > PTR_ERR(dsi->te_gpio)); > return PTR_ERR(dsi->te_gpio);
diff --git a/drivers/gpu/drm/exynos/exynos_drm_dsi.c b/drivers/gpu/drm/exynos/exynos_drm_dsi.c index 32a36572b894..14ebbb124852 100644 --- a/drivers/gpu/drm/exynos/exynos_drm_dsi.c +++ b/drivers/gpu/drm/exynos/exynos_drm_dsi.c @@ -1335,7 +1335,9 @@ static int exynos_dsi_register_te_irq(struct exynos_dsi *dsi, int te_gpio_irq; dsi->te_gpio = devm_gpiod_get_optional(dsi->dev, "te", GPIOD_IN); - if (IS_ERR(dsi->te_gpio)) { + if (!dsi->te_gpio) { + return 0; + } else if (IS_ERR(dsi->te_gpio)) { dev_err(dsi->dev, "gpio request failed with %ld\n", PTR_ERR(dsi->te_gpio)); return PTR_ERR(dsi->te_gpio);
TE-gpio is optional and if it is not found then gpiod_get_optional() returns NULL. In such case the code will continue and try to convert NULL gpiod to irq what in turn fails. The failure is then propagated and driver is not registered. Fix this by returning early from exynos_dsi_register_te_irq() if no TE-gpio is found. Fixes: ee6c8b5afa62 ("drm/exynos: Replace legacy gpio interface for gpiod interface") Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com> --- drivers/gpu/drm/exynos/exynos_drm_dsi.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)