diff options
| author | Wei Yongjun <yongjun_wei@trendmicro.com.cn> | 2013-05-07 02:19:25 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-05-08 13:13:30 -0700 |
| commit | 155d940a78fd0761c2d73c5bd95a9dd287d58054 (patch) | |
| tree | 515cd760a696f436a64ae0ae3c16151a128d4375 /drivers/net/ethernet | |
| parent | 228fb087a0098e9d4a2498f388762ff379eebae1 (diff) | |
| download | op-kernel-dev-155d940a78fd0761c2d73c5bd95a9dd287d58054.zip op-kernel-dev-155d940a78fd0761c2d73c5bd95a9dd287d58054.tar.gz | |
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>
Diffstat (limited to 'drivers/net/ethernet')
| -rw-r--r-- | drivers/net/ethernet/sfc/ptp.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/net/ethernet/sfc/ptp.c b/drivers/net/ethernet/sfc/ptp.c index 07f6baa..9a95abf 100644 --- a/drivers/net/ethernet/sfc/ptp.c +++ b/drivers/net/ethernet/sfc/ptp.c @@ -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"); |
