Commit 155d940a authored May 07, 2013 by Wei Yongjun Committed by David S. Miller May 08, 2013

sfc: fix return value check in efx_ptp_probe_channel()



In case of error, the function ptp_clock_register() returns ERR_PTR()
and never returns NULL. The NULL test in the return value check should
be replaced with IS_ERR().

Signed-off-by: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
Reviewed-by: Ben Hutchings <bhutchings@solarflare.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent 228fb087

drivers/net/ethernet/sfc/ptp.c

+3 −1

Original line number	Diff line number	Diff line
		@@ -912,8 +912,10 @@ static int efx_ptp_probe_channel(struct efx_channel *channel)

		ptp->phc_clock = ptp_clock_register(&ptp->phc_clock_info,
		&efx->pci_dev->dev);
		if (!ptp->phc_clock)
		if (IS_ERR(ptp->phc_clock)) {
		rc = PTR_ERR(ptp->phc_clock);
		goto fail3;
		}

		INIT_WORK(&ptp->pps_work, efx_ptp_pps_worker);
		ptp->pps_workwq = create_singlethread_workqueue("sfc_pps");