projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm
[cascardo/linux.git]
/
drivers
/
phy
/
phy-rockchip-dp.c
diff --git
a/drivers/phy/phy-rockchip-dp.c
b/drivers/phy/phy-rockchip-dp.c
index
77e2d02
..
793ecb6
100644
(file)
--- a/
drivers/phy/phy-rockchip-dp.c
+++ b/
drivers/phy/phy-rockchip-dp.c
@@
-86,6
+86,9
@@
static int rockchip_dp_phy_probe(struct platform_device *pdev)
if (!np)
return -ENODEV;
if (!np)
return -ENODEV;
+ if (!dev->parent || !dev->parent->of_node)
+ return -ENODEV;
+
dp = devm_kzalloc(dev, sizeof(*dp), GFP_KERNEL);
if (IS_ERR(dp))
return -ENOMEM;
dp = devm_kzalloc(dev, sizeof(*dp), GFP_KERNEL);
if (IS_ERR(dp))
return -ENOMEM;
@@
-104,9
+107,9
@@
static int rockchip_dp_phy_probe(struct platform_device *pdev)
return ret;
}
return ret;
}
- dp->grf = syscon_
regmap_lookup_by_phandle(np, "rockchip,grf"
);
+ dp->grf = syscon_
node_to_regmap(dev->parent->of_node
);
if (IS_ERR(dp->grf)) {
if (IS_ERR(dp->grf)) {
- dev_err(dev, "rk3288-dp needs
rockchip,grf property
\n");
+ dev_err(dev, "rk3288-dp needs
the General Register Files syscon
\n");
return PTR_ERR(dp->grf);
}
return PTR_ERR(dp->grf);
}