diff options
| author | Dave Airlie | 2017-04-10 23:40:42 +0200 |
|---|---|---|
| committer | Dave Airlie | 2017-04-10 23:40:42 +0200 |
| commit | b769fefb68cd70385d68220ae341e5a10723fbc0 (patch) | |
| tree | a2881410c9dc5a3474619d155fac981cfbd4ee8f /drivers/gpu/drm/msm/dsi | |
| parent | Merge branch 'drm-next-4.12' of git://people.freedesktop.org/~agd5f/linux int... (diff) | |
| parent | Linux 4.11-rc6 (diff) | |
| download | kernel-qcow2-linux-b769fefb68cd70385d68220ae341e5a10723fbc0.tar.gz kernel-qcow2-linux-b769fefb68cd70385d68220ae341e5a10723fbc0.tar.xz kernel-qcow2-linux-b769fefb68cd70385d68220ae341e5a10723fbc0.zip | |
Backmerge tag 'v4.11-rc6' into drm-next
Linux 4.11-rc6
drm-misc needs 4.11-rc5, may as well fix conflicts with rc6.
Diffstat (limited to 'drivers/gpu/drm/msm/dsi')
| -rw-r--r-- | drivers/gpu/drm/msm/dsi/dsi_manager.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/msm/dsi/dsi_manager.c b/drivers/gpu/drm/msm/dsi/dsi_manager.c index 921270ea6059..a879ffa534b4 100644 --- a/drivers/gpu/drm/msm/dsi/dsi_manager.c +++ b/drivers/gpu/drm/msm/dsi/dsi_manager.c @@ -171,7 +171,7 @@ dsi_mgr_phy_enable(int id, } } } else { - msm_dsi_host_reset_phy(mdsi->host); + msm_dsi_host_reset_phy(msm_dsi->host); ret = enable_phy(msm_dsi, src_pll_id, &shared_timings[id]); if (ret) return ret; |