linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Sasha Levin <Alexander.Levin@microsoft.com>
To: "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
	"stable@vger.kernel.org" <stable@vger.kernel.org>
Cc: Christophe JAILLET <christophe.jaillet@wanadoo.fr>,
	"David S . Miller" <davem@davemloft.net>,
	Sasha Levin <Alexander.Levin@microsoft.com>
Subject: [PATCH AUTOSEL for 4.9 32/55] bnxt_en: Fix an error handling path in 'bnxt_get_module_eeprom()'
Date: Wed, 24 Jan 2018 04:15:45 +0000	[thread overview]
Message-ID: <20180124041521.32223-32-alexander.levin@microsoft.com> (raw)
In-Reply-To: <20180124041521.32223-1-alexander.levin@microsoft.com>

From: Christophe JAILLET <christophe.jaillet@wanadoo.fr>

[ Upstream commit dea521a2b9f96e905fa2bb2f95e23ec00c2ec436 ]

Error code returned by 'bnxt_read_sfp_module_eeprom_info()' is handled a
few lines above when reading the A0 portion of the EEPROM.
The same should be done when reading the A2 portion of the EEPROM.

In order to correctly propagate an error, update 'rc' in this 2nd call as
well, otherwise 0 (success) is returned.

Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
---
 drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c b/drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c
index a7e04ff4eaed..cde4b96f3153 100644
--- a/drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c
+++ b/drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c
@@ -1843,8 +1843,8 @@ static int bnxt_get_module_eeprom(struct net_device *dev,
 	/* Read A2 portion of the EEPROM */
 	if (length) {
 		start -= ETH_MODULE_SFF_8436_LEN;
-		bnxt_read_sfp_module_eeprom_info(bp, I2C_DEV_ADDR_A2, 1, start,
-						 length, data);
+		rc = bnxt_read_sfp_module_eeprom_info(bp, I2C_DEV_ADDR_A2, 1,
+						      start, length, data);
 	}
 	return rc;
 }
-- 
2.11.0

  parent reply	other threads:[~2018-01-24  4:18 UTC|newest]

Thread overview: 58+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-01-24  4:15 [PATCH AUTOSEL for 4.9 01/55] drm/vc4: Account for interrupts in flight Sasha Levin
2018-01-24  4:15 ` [PATCH AUTOSEL for 4.9 02/55] cpupowerutils: bench - Fix cpu online check Sasha Levin
2018-01-24  4:15 ` [PATCH AUTOSEL for 4.9 04/55] KVM: x86: emulator: Return to user-mode on L1 CPL=0 emulation failure Sasha Levin
2018-01-24  4:15 ` [PATCH AUTOSEL for 4.9 03/55] cpupower : Fix cpupower working when cpu0 is offline Sasha Levin
2018-01-24  4:15 ` [PATCH AUTOSEL for 4.9 05/55] KVM: x86: Don't re-execute instruction when not passing CR2 value Sasha Levin
2018-01-24  4:15 ` [PATCH AUTOSEL for 4.9 06/55] KVM: X86: Fix operand/address-size during instruction decoding Sasha Levin
2018-01-24  4:15 ` [PATCH AUTOSEL for 4.9 07/55] KVM: x86: ioapic: Fix level-triggered EOI and IOAPIC reconfigure race Sasha Levin
2018-01-24  4:15 ` [PATCH AUTOSEL for 4.9 09/55] KVM: x86: ioapic: Preserve read-only values in the redirection table Sasha Levin
2018-01-24  4:15 ` [PATCH AUTOSEL for 4.9 08/55] KVM: x86: ioapic: Clear Remote IRR when entry is switched to edge-triggered Sasha Levin
2018-01-24  4:15 ` [PATCH AUTOSEL for 4.9 10/55] ACPI / bus: Leave modalias empty for devices which are not present Sasha Levin
2018-01-24  4:15 ` [PATCH AUTOSEL for 4.9 11/55] cpufreq: Add Loongson machine dependencies Sasha Levin
2018-01-24  4:15 ` [PATCH AUTOSEL for 4.9 12/55] bcache: check return value of register_shrinker Sasha Levin
2018-01-24  4:15 ` [PATCH AUTOSEL for 4.9 13/55] drm/amdgpu: Fix SDMA load/unload sequence on HWS disabled mode Sasha Levin
2018-01-24  4:15 ` [PATCH AUTOSEL for 4.9 14/55] drm/amdkfd: Fix SDMA ring buffer size calculation Sasha Levin
2018-01-24  4:15 ` [PATCH AUTOSEL for 4.9 16/55] openvswitch: fix the incorrect flow action alloc size Sasha Levin
2018-01-24  4:15 ` [PATCH AUTOSEL for 4.9 15/55] drm/amdkfd: Fix SDMA oversubsription handling Sasha Levin
2018-01-24  4:15 ` [PATCH AUTOSEL for 4.9 18/55] btrfs: fix deadlock when writing out space cache Sasha Levin
2018-01-24  4:15 ` [PATCH AUTOSEL for 4.9 17/55] mac80211: fix the update of path metric for RANN frame Sasha Levin
2018-01-24  4:15 ` [PATCH AUTOSEL for 4.9 19/55] reiserfs: remove unneeded i_version bump Sasha Levin
2018-01-24  4:15 ` [PATCH AUTOSEL for 4.9 20/55] KVM: X86: Fix softlockup when get the current kvmclock Sasha Levin
2018-01-24  4:15 ` [PATCH AUTOSEL for 4.9 21/55] KVM: VMX: Fix rflags cache during vCPU reset Sasha Levin
2018-01-24  4:15 ` [PATCH AUTOSEL for 4.9 22/55] xfs: always free inline data before resetting inode fork during ifree Sasha Levin
2018-01-24  4:15 ` [PATCH AUTOSEL for 4.9 23/55] xen-netfront: remove warning when unloading module Sasha Levin
2018-01-24  4:15 ` [PATCH AUTOSEL for 4.9 24/55] auxdisplay: img-ascii-lcd: Only build on archs that have IOMEM Sasha Levin
2018-01-24  4:15 ` [PATCH AUTOSEL for 4.9 25/55] nfsd: CLOSE SHOULD return the invalid special stateid for NFSv4.x (x>0) Sasha Levin
2018-01-24  4:15 ` [PATCH AUTOSEL for 4.9 26/55] nfsd: Ensure we don't recognise lock stateids after freeing them Sasha Levin
2018-01-24 15:47   ` J. Bruce Fields
2018-01-24  4:15 ` [PATCH AUTOSEL for 4.9 27/55] nfsd: Ensure we check stateid validity in the seqid operation checks Sasha Levin
2018-01-24  4:15 ` [PATCH AUTOSEL for 4.9 28/55] grace: replace BUG_ON by WARN_ONCE in exit_net hook Sasha Levin
2018-01-24  4:15 ` [PATCH AUTOSEL for 4.9 29/55] nfsd: check for use of the closed special stateid Sasha Levin
2018-01-24  4:15 ` [PATCH AUTOSEL for 4.9 30/55] lockd: fix "list_add double add" caused by legacy signal interface Sasha Levin
2018-01-24  4:15 ` [PATCH AUTOSEL for 4.9 31/55] hwmon: (pmbus) Use 64bit math for DIRECT format values Sasha Levin
2018-01-24  4:15 ` Sasha Levin [this message]
2018-01-24  4:15 ` [PATCH AUTOSEL for 4.9 33/55] xfs: fortify xfs_alloc_buftarg error handling Sasha Levin
2018-01-24  4:15 ` [PATCH AUTOSEL for 4.9 34/55] drm/amdgpu: don't try to move pinned BOs Sasha Levin
2018-01-24  4:15 ` [PATCH AUTOSEL for 4.9 35/55] net: ethernet: xilinx: Mark XILINX_LL_TEMAC broken on 64-bit Sasha Levin
2018-01-24  4:15 ` [PATCH AUTOSEL for 4.9 36/55] quota: Check for register_shrinker() failure Sasha Levin
2018-01-24  4:15 ` [PATCH AUTOSEL for 4.9 37/55] SUNRPC: Allow connect to return EHOSTUNREACH Sasha Levin
2018-01-24  4:15 ` [PATCH AUTOSEL for 4.9 39/55] kmemleak: add scheduling point to kmemleak_scan() Sasha Levin
2018-01-24  4:15 ` [PATCH AUTOSEL for 4.9 38/55] fs/mbcache.c: make count_objects() more robust Sasha Levin
2018-01-24  4:29   ` Eric Biggers
2018-01-24 17:27     ` Sasha Levin
2018-01-24  4:15 ` [PATCH AUTOSEL for 4.9 40/55] drm/bridge: tc358767: do no fail on hi-res displays Sasha Levin
2018-01-24  4:15 ` [PATCH AUTOSEL for 4.9 41/55] drm/bridge: tc358767: filter out too high modes Sasha Levin
2018-01-24  4:15 ` [PATCH AUTOSEL for 4.9 42/55] drm/bridge: tc358767: fix DP0_MISC register set Sasha Levin
2018-01-24  4:15 ` [PATCH AUTOSEL for 4.9 43/55] drm/bridge: tc358767: fix timing calculations Sasha Levin
2018-01-24  4:15 ` [PATCH AUTOSEL for 4.9 44/55] drm/bridge: tc358767: fix AUXDATAn registers access Sasha Levin
2018-01-24  4:15 ` [PATCH AUTOSEL for 4.9 46/55] drm/omap: Fix error handling path in 'omap_dmm_probe()' Sasha Levin
2018-01-24  4:15 ` [PATCH AUTOSEL for 4.9 45/55] drm/bridge: tc358767: fix 1-lane behavior Sasha Levin
2018-01-24  4:15 ` [PATCH AUTOSEL for 4.9 48/55] xfs: Properly retry failed dquot items in case of error during buffer writeback Sasha Levin
2018-01-24  4:15 ` [PATCH AUTOSEL for 4.9 47/55] xfs: ubsan fixes Sasha Levin
2018-01-24  4:15 ` [PATCH AUTOSEL for 4.9 50/55] scsi: ufs: ufshcd: fix potential NULL pointer dereference in ufshcd_config_vreg Sasha Levin
2018-01-24  4:15 ` [PATCH AUTOSEL for 4.9 49/55] scsi: aacraid: Prevent crash in case of free interrupt during scsi EH path Sasha Levin
2018-01-24  4:15 ` [PATCH AUTOSEL for 4.9 51/55] iwlwifi: mvm: fix the TX queue hang timeout for MONITOR vif type Sasha Levin
2018-01-24  4:15 ` [PATCH AUTOSEL for 4.9 52/55] ARM: dts: NSP: Fix PPI interrupt types Sasha Levin
2018-01-24  4:15 ` [PATCH AUTOSEL for 4.9 53/55] media: usbtv: add a new usbid Sasha Levin
2018-01-24  4:15 ` [PATCH AUTOSEL for 4.9 54/55] usb: gadget: don't dereference g until after it has been null checked Sasha Levin
2018-01-24  4:15 ` [PATCH AUTOSEL for 4.9 55/55] staging: rtl8188eu: Fix incorrect response to SIOCGIWESSID Sasha Levin

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20180124041521.32223-32-alexander.levin@microsoft.com \
    --to=alexander.levin@microsoft.com \
    --cc=christophe.jaillet@wanadoo.fr \
    --cc=davem@davemloft.net \
    --cc=linux-kernel@vger.kernel.org \
    --cc=stable@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).