| From foo@baz Thu Feb 1 14:00:34 CET 2018 |
| From: Christophe JAILLET <christophe.jaillet@wanadoo.fr> |
| Date: Tue, 21 Nov 2017 20:46:49 +0100 |
| Subject: bnxt_en: Fix an error handling path in 'bnxt_get_module_eeprom()' |
| |
| 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> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| --- |
| drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c | 4 ++-- |
| 1 file changed, 2 insertions(+), 2 deletions(-) |
| |
| --- 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 |
| /* 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; |
| } |