Patchwork sfc: fix return value check in efx_ptp_probe_channel()

login
register
mail settings
Submitter Wei Yongjun
Date May 7, 2013, 12:19 p.m.
Message ID <CAPgLHd9-6uOYFs5PVSmxGmPBidtWNWk9ZK6O8s7_6KWQihu=4w@mail.gmail.com>
Download mbox | patch
Permalink /patch/242191/
State Accepted
Delegated to: David Miller
Headers show

Comments

Wei Yongjun - May 7, 2013, 12:19 p.m.
From: Wei Yongjun <yongjun_wei@trendmicro.com.cn>

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>
---
 drivers/net/ethernet/sfc/ptp.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)


--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Ben Hutchings - May 7, 2013, 2:51 p.m.
On Tue, 2013-05-07 at 20:19 +0800, Wei Yongjun wrote:
> From: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
> 
> 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>

Although the current code is obviously wrong not to set rc, it was not
clear that ptp_clock_register() returns an ERR_PTR rather than NULL on
error.  Please could you add that fact to its kernel-doc comment?

Ben.

> ---
>  drivers/net/ethernet/sfc/ptp.c | 4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)
> 
> 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");
>
David Miller - May 8, 2013, 8:15 p.m.
From: Wei Yongjun <weiyj.lk@gmail.com>
Date: Tue, 7 May 2013 20:19:25 +0800

> From: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
> 
> 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>

Applied.
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch

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");