summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/msm/hdmi/hdmi_phy_8960.c
diff options
context:
space:
mode:
authorRob Clark <robdclark@gmail.com>2014-11-04 13:33:14 -0500
committerRob Clark <robdclark@gmail.com>2014-11-16 14:22:42 -0500
commit067fef372c7356f64e4d307218df0fae49f9c88e (patch)
tree208fe0b1e8dca420a2ae9849a54b91f907e5e4ba /drivers/gpu/drm/msm/hdmi/hdmi_phy_8960.c
parentbc00ae02e4a0b0d34a03bb25a8285b80e4f628c4 (diff)
downloadop-kernel-dev-067fef372c7356f64e4d307218df0fae49f9c88e.zip
op-kernel-dev-067fef372c7356f64e4d307218df0fae49f9c88e.tar.gz
drm/msm/hdmi: refactor bind/init
Split up hdmi_init() into hdmi_init() (done at hdmi sub-device bind/probe time) and hdmi_modeset_init() done from master driver's modeset_init(). Anything that can fail due to dependencies on other drivers which may be missing or not probed yet should go in hdmi_init(), so that devm error/cleanup paths work properly. Signed-off-by: Rob Clark <robdclark@gmail.com>
Diffstat (limited to 'drivers/gpu/drm/msm/hdmi/hdmi_phy_8960.c')
-rw-r--r--drivers/gpu/drm/msm/hdmi/hdmi_phy_8960.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/msm/hdmi/hdmi_phy_8960.c b/drivers/gpu/drm/msm/hdmi/hdmi_phy_8960.c
index f408b69..eeed006 100644
--- a/drivers/gpu/drm/msm/hdmi/hdmi_phy_8960.c
+++ b/drivers/gpu/drm/msm/hdmi/hdmi_phy_8960.c
@@ -510,7 +510,7 @@ struct hdmi_phy *hdmi_phy_8960_init(struct hdmi *hdmi)
#ifdef CONFIG_COMMON_CLK
phy_8960->pll_hw.init = &pll_init;
- phy_8960->pll = devm_clk_register(hdmi->dev->dev, &phy_8960->pll_hw);
+ phy_8960->pll = devm_clk_register(&hdmi->pdev->dev, &phy_8960->pll_hw);
if (IS_ERR(phy_8960->pll)) {
ret = PTR_ERR(phy_8960->pll);
phy_8960->pll = NULL;
OpenPOWER on IntegriCloud