Skip to content

Commit 8f1c17a

Browse files
committed
drm/bridge: analogix_dp: fix merge
1 parent 9ac1216 commit 8f1c17a

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

drivers/gpu/drm/bridge/analogix/analogix_dp_core.c

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1634,7 +1634,7 @@ analogix_dp_bind(struct device *dev, struct drm_device *drm_dev,
16341634
"hpd_gpio");
16351635
if (ret) {
16361636
dev_err(&pdev->dev, "failed to get hpd gpio\n");
1637-
return ERR_PTR(ret);
1637+
goto err_disable_clk;
16381638
}
16391639
dp->irq = gpio_to_irq(dp->hpd_gpio);
16401640
irq_flags = IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING;
@@ -1685,6 +1685,8 @@ analogix_dp_bind(struct device *dev, struct drm_device *drm_dev,
16851685

16861686
pm_runtime_disable(dev);
16871687

1688+
err_disable_clk:
1689+
clk_disable_unprepare(dp->clock);
16881690
return ERR_PTR(ret);
16891691
}
16901692
EXPORT_SYMBOL_GPL(analogix_dp_bind);

0 commit comments

Comments
 (0)