From patchwork Tue May 7 12:19:25 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wei Yongjun X-Patchwork-Id: 242191 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 919B42C0174 for ; Tue, 7 May 2013 22:19:31 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757722Ab3EGMT1 (ORCPT ); Tue, 7 May 2013 08:19:27 -0400 Received: from mail-bk0-f45.google.com ([209.85.214.45]:62114 "EHLO mail-bk0-f45.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755969Ab3EGMT0 (ORCPT ); Tue, 7 May 2013 08:19:26 -0400 Received: by mail-bk0-f45.google.com with SMTP id je9so248875bkc.4 for ; Tue, 07 May 2013 05:19:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:x-received:date:message-id:subject:from:to:cc :content-type; bh=aUwQyYKROMK030s2KTotNHVNTndedFjbgUXYGhP4yZc=; b=O9+DAfF1j/Dgp7oQq3OzxS4AzQy5r31U0bqmxSKGmvPuVhZIzAW+qbkXDi5RjysqGN 1ZkLuM4opReVGhLmC+D/sT+yVfeS8KayX465AvuyvEPgNu1JsT0dJAizjDjaFrKDa6F0 T7M7Dpo7VX11W1Q0ARFeYrwXv5GSoZW9WcxIIYO1U+UjYrhuRknqvtYqNS4RBLGAZlgn MXCIT/tOWD21XA5B3Lndz4+IW3QN8qRzrWXba2KjaUw+N8WndW4cUpObOC4NAj5PYJMe NM/aaCX7xDlJq9dWdzkhGOlY5VISY/rBMReWQTmaQzO2DJPr3E3o8+dwGek1NiSFrVp2 9BPA== MIME-Version: 1.0 X-Received: by 10.204.168.201 with SMTP id v9mr486100bky.116.1367929165142; Tue, 07 May 2013 05:19:25 -0700 (PDT) Received: by 10.204.199.129 with HTTP; Tue, 7 May 2013 05:19:25 -0700 (PDT) Date: Tue, 7 May 2013 20:19:25 +0800 Message-ID: Subject: [PATCH] sfc: fix return value check in efx_ptp_probe_channel() From: Wei Yongjun To: linux-net-drivers@solarflare.com, bhutchings@solarflare.com Cc: yongjun_wei@trendmicro.com.cn, netdev@vger.kernel.org Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Wei Yongjun 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 Reviewed-by: Ben Hutchings --- 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 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");