Merge branch 'for-linus' of git://git.armlinux.org.uk/~rmk/linux-arm

[cascardo/linux.git] / drivers / net / ethernet / mellanox / mlx4 / en_clock.c

diff --git a/drivers/net/ethernet/mellanox/mlx4/en_clock.c b/drivers/net/ethernet/mellanox/mlx4/en_clock.c
index 1494997..08fc5fc 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx4/en_clock.c
+++ b/drivers/net/ethernet/mellanox/mlx4/en_clock.c
@@ -298,7 +298,7 @@ void mlx4_en_init_timestamp(struct mlx4_en_dev *mdev)
        if (IS_ERR(mdev->ptp_clock)) {
                mdev->ptp_clock = NULL;
                mlx4_err(mdev, "ptp_clock_register failed\n");
-       } else {
+       } else if (mdev->ptp_clock) {
                mlx4_info(mdev, "registered PHC clock\n");
        }