git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'drm-misc-fixes-2017-11-13' of git://anongit.freedesktop.org/drm/drm-misc...
[sfrench/cifs-2.6.git]
/
drivers
/
gpu
/
drm
/
msm
/
hdmi
/
hdmi_phy.c
diff --git
a/drivers/gpu/drm/msm/hdmi/hdmi_phy.c
b/drivers/gpu/drm/msm/hdmi/hdmi_phy.c
index 534ce5b49781dd9dd9bbd677ecc397c9472cf647..5e631392dc851a035bdf8ee19a78deabe9ff3808 100644
(file)
--- a/
drivers/gpu/drm/msm/hdmi/hdmi_phy.c
+++ b/
drivers/gpu/drm/msm/hdmi/hdmi_phy.c
@@
-48,7
+48,7
@@
static int msm_hdmi_phy_resource_init(struct hdmi_phy *phy)
for (i = 0; i < cfg->num_clks; i++) {
struct clk *clk;
- clk =
devm_clk_get(
dev, cfg->clk_names[i]);
+ clk =
msm_clk_get(phy->p
dev, cfg->clk_names[i]);
if (IS_ERR(clk)) {
ret = PTR_ERR(clk);
dev_err(dev, "failed to get phy clock: %s (%d)\n",