aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/phy
diff options
context:
space:
mode:
authorRichard Cochran <richardcochran@gmail.com>2012-09-22 03:02:03 -0400
committerDavid S. Miller <davem@davemloft.net>2012-09-22 15:42:38 -0400
commit1ef761582c074448bae5be97abde5934667e7710 (patch)
treefc4679a8f28897043be34fda0465562be66d7f55 /drivers/net/phy
parent5c35bad5ffe5accde6b0ef4468b39e1db0806b94 (diff)
ptp: link the phc device to its parent device
PTP Hardware Clock devices appear as class devices in sysfs. This patch changes the registration API to use the parent device, clarifying the clock's relationship to the underlying device. Signed-off-by: Richard Cochran <richardcochran@gmail.com> Acked-by: Ben Hutchings <bhutchings@solarflare.com> Acked-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/phy')
-rw-r--r--drivers/net/phy/dp83640.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/phy/dp83640.c b/drivers/net/phy/dp83640.c
index b0da0226661..24e05c43bff 100644
--- a/drivers/net/phy/dp83640.c
+++ b/drivers/net/phy/dp83640.c
@@ -980,7 +980,7 @@ static int dp83640_probe(struct phy_device *phydev)
980 980
981 if (choose_this_phy(clock, phydev)) { 981 if (choose_this_phy(clock, phydev)) {
982 clock->chosen = dp83640; 982 clock->chosen = dp83640;
983 clock->ptp_clock = ptp_clock_register(&clock->caps); 983 clock->ptp_clock = ptp_clock_register(&clock->caps, &phydev->dev);
984 if (IS_ERR(clock->ptp_clock)) { 984 if (IS_ERR(clock->ptp_clock)) {
985 err = PTR_ERR(clock->ptp_clock); 985 err = PTR_ERR(clock->ptp_clock);
986 goto no_register; 986 goto no_register;