diff options
| author | Nicolas Pitre <nicolas.pitre@linaro.org> | 2016-09-20 19:25:58 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-09-22 02:18:33 -0400 |
| commit | efee95f42b5dddedcaff0a0eaa44e170fc7522e8 (patch) | |
| tree | e5d83b374d57e1bced53af0345db98f0f6cd4373 /drivers/net/ethernet/intel/e1000e | |
| parent | d270f76c2d6ee3d96cfb1affb78a3d536e0b8fd6 (diff) | |
| download | op-kernel-dev-efee95f42b5dddedcaff0a0eaa44e170fc7522e8.zip op-kernel-dev-efee95f42b5dddedcaff0a0eaa44e170fc7522e8.tar.gz | |
ptp_clock: future-proofing drivers against PTP subsystem becoming optional
Drivers must be ready to accept NULL from ptp_clock_register() if the
PTP clock subsystem is configured out.
This patch documents that and ensures that all drivers cope well
with a NULL return.
Signed-off-by: Nicolas Pitre <nico@linaro.org>
Reviewed-by: Eugenia Emantayev <eugenia@mellanox.com>
Acked-by: Richard Cochran <richardcochran@gmail.com>
Acked-by: Edward Cree <ecree@solarflare.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/intel/e1000e')
| -rw-r--r-- | drivers/net/ethernet/intel/e1000e/ptp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/intel/e1000e/ptp.c b/drivers/net/ethernet/intel/e1000e/ptp.c index 2e1b17a..ad03763 100644 --- a/drivers/net/ethernet/intel/e1000e/ptp.c +++ b/drivers/net/ethernet/intel/e1000e/ptp.c @@ -334,7 +334,7 @@ void e1000e_ptp_init(struct e1000_adapter *adapter) if (IS_ERR(adapter->ptp_clock)) { adapter->ptp_clock = NULL; e_err("ptp_clock_register failed\n"); - } else { + } else if (adapter->ptp_clock) { e_info("registered PHC clock\n"); } } |
