From patchwork Tue Dec 25 07:36:19 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kangjie Lu X-Patchwork-Id: 1018359 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=umn.edu Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=umn.edu header.i=@umn.edu header.b="a+C7Rqg3"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 43P7Gh41xJz9sC7 for ; Tue, 25 Dec 2018 18:37:16 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1725847AbeLYHhD (ORCPT ); Tue, 25 Dec 2018 02:37:03 -0500 Received: from mta-p8.oit.umn.edu ([134.84.196.208]:39156 "EHLO mta-p8.oit.umn.edu" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725839AbeLYHhC (ORCPT ); Tue, 25 Dec 2018 02:37:02 -0500 Received: from localhost (unknown [127.0.0.1]) by mta-p8.oit.umn.edu (Postfix) with ESMTP id 55AE3BA1 for ; Tue, 25 Dec 2018 07:37:01 +0000 (UTC) X-Virus-Scanned: amavisd-new at umn.edu Received: from mta-p8.oit.umn.edu ([127.0.0.1]) by localhost (mta-p8.oit.umn.edu [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id w5b1JMVKEl-f for ; Tue, 25 Dec 2018 01:37:01 -0600 (CST) Received: from mail-io1-f69.google.com (mail-io1-f69.google.com [209.85.166.69]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mta-p8.oit.umn.edu (Postfix) with ESMTPS id 2CAB2A9C for ; Tue, 25 Dec 2018 01:37:01 -0600 (CST) Received: by mail-io1-f69.google.com with SMTP id q207so13411049iod.18 for ; Mon, 24 Dec 2018 23:37:01 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=umn.edu; s=google; h=from:to:cc:subject:date:message-id; bh=JiJfleo6rJQmt0Cue6Ul+9uEjSUyPKKMsTea62cJlUo=; b=a+C7Rqg3GiAT+TNUpDxEJszJe1HQwLCVSaa58VY0Bll4Gl9ShH5xpXPBsALV8AqDTn SURyEZtKPlAHGEnQwH/NkjAywMQIPeG9OXECw4lUmY28BjLPUcbEWzPP0dGsHxsnZqz2 u8QmcTG5gwopXYN+bSrAo2LcfOgLcxW6QF9g07/zyyA2w1LZmugw2RAi+z6VdZFo3oxT 08IggZPH5i/Yk3FnLAe7g3cK30dKjKJ+aYnw1qINxWer7FB+gPsfIUFAJ2n2ozujvUPo 2FTGr86YU9EPfs8VvtuokX+5NMJTZMD4ie35r1WZhTC9ydnxg1iPtBqayanGEoccN4a4 11oA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=JiJfleo6rJQmt0Cue6Ul+9uEjSUyPKKMsTea62cJlUo=; b=Vy+bokHj27SxVkV9cMe+GWOriwQESbfeO/Hg5KHYjTPX68MqnfbHJrhvuNUzgbO+PB EmvrbFt4AsHlC2puyLRgNPSwVQc4HgOWZNWPYwgjjwzYgMM7HcV08jDHPMze+QllfDse lyvO37MrRRyL0QU+ro6Nbw5POQ7VwReAHr0KC4ddqtUskAqcV55+FtzWqvE+lWX+mMSk 1BRBNBtpYp/v1bmvvRcFZaBfgkNDLC5nQVyvrsPC3X2WVih2NzZbFB8hbp2+jJtoBbjz Jz3UKTtBOjcmUDlhnfD70CIJRN1HNjb79Cigp9pKpdoLCHwPgePrsGxdPfsClYbuvfCr sFGg== X-Gm-Message-State: AJcUukfXL2m01FLoQz769iLAQz9MPcUqVYlzwRNi/gqO/M+o8cAbs3I1 cG/LxcDptMzF+0jocwdb4u5GU5FRKm2f14eTdi5i0KpP3jKdR5J2fnEbGw9gd7z4f6iW6X7arEs m+D+zMqZ+qAK5rCmSGzzc X-Received: by 2002:a5e:d719:: with SMTP id v25mr10594312iom.244.1545723420750; Mon, 24 Dec 2018 23:37:00 -0800 (PST) X-Google-Smtp-Source: ALg8bN44LUEhPv0xHUS0SzhwIkocNM6VO2CfrtQzB0kzYqRwOHtSpEz87YtDexw6G250AZYSJxpnmQ== X-Received: by 2002:a5e:d719:: with SMTP id v25mr10594306iom.244.1545723420535; Mon, 24 Dec 2018 23:37:00 -0800 (PST) Received: from localhost.localdomain (host-173-230-104-22.mnmigsc.mn.minneapolis.us.clients.pavlovmedia.net. [173.230.104.22]) by smtp.gmail.com with ESMTPSA id r21sm11362166ita.27.2018.12.24.23.36.59 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 24 Dec 2018 23:36:59 -0800 (PST) From: Kangjie Lu To: kjlu@umn.edu Cc: pakki001@umn.edu, Jeff Kirsher , "David S. Miller" , intel-wired-lan@lists.osuosl.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] ethernet: (80003es2lan) fix missing checks for return value of reg write Date: Tue, 25 Dec 2018 01:36:19 -0600 Message-Id: <20181225073620.67962-1-kjlu@umn.edu> X-Mailer: git-send-email 2.17.2 (Apple Git-113) Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org e1000_write_kmrn_reg_80003es2lan() may fail. The fix checks its return value and returns with its error code if it fails. Signed-off-by: Kangjie Lu --- drivers/net/ethernet/intel/e1000e/80003es2lan.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/drivers/net/ethernet/intel/e1000e/80003es2lan.c b/drivers/net/ethernet/intel/e1000e/80003es2lan.c index 257bd59bc9c6..7e2d4b9839bb 100644 --- a/drivers/net/ethernet/intel/e1000e/80003es2lan.c +++ b/drivers/net/ethernet/intel/e1000e/80003es2lan.c @@ -699,8 +699,11 @@ static s32 e1000_reset_hw_80003es2lan(struct e1000_hw *hw) if (ret_val) return ret_val; kum_reg_data |= E1000_KMRNCTRLSTA_IBIST_DISABLE; - e1000_write_kmrn_reg_80003es2lan(hw, E1000_KMRNCTRLSTA_INBAND_PARAM, - kum_reg_data); + ret_val = + e1000_write_kmrn_reg_80003es2lan(hw, + E1000_KMRNCTRLSTA_INBAND_PARAM, kum_reg_data); + if (ret_val) + return ret_val; ret_val = e1000e_get_auto_rd_done(hw); if (ret_val) @@ -757,8 +760,11 @@ static s32 e1000_init_hw_80003es2lan(struct e1000_hw *hw) e1000_read_kmrn_reg_80003es2lan(hw, E1000_KMRNCTRLSTA_INBAND_PARAM, &kum_reg_data); kum_reg_data |= E1000_KMRNCTRLSTA_IBIST_DISABLE; - e1000_write_kmrn_reg_80003es2lan(hw, E1000_KMRNCTRLSTA_INBAND_PARAM, - kum_reg_data); + ret_val = + e1000_write_kmrn_reg_80003es2lan(hw, + E1000_KMRNCTRLSTA_INBAND_PARAM, kum_reg_data); + if (ret_val) + return ret_val; /* Set the transmit descriptor write-back policy */ reg_data = er32(TXDCTL(0));