Return-path: Received: from incomingmail.riverbed.com ([208.70.196.45]:44684 "EHLO smtp1.riverbed.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750915AbcGAPT1 (ORCPT ); Fri, 1 Jul 2016 11:19:27 -0400 To: ath9k-devel@lists.ath9k.org, linux-wireless@vger.kernel.org Cc: kvalo@qca.qualcomm.com From: Eduardo Abinader Subject: [PATCH] ath9k: consider return code on ar9300_eeprom_restore_flash Message-ID: <577688D8.2080600@riverbed.com> (sfid-20160701_171931_231080_52ADCC9C) Date: Fri, 1 Jul 2016 17:14:32 +0200 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Sender: linux-wireless-owner@vger.kernel.org List-ID: just to comply with current ath9k_hw_nvram_read to return value, hence behaving reacting accordingly. Signed-off-by: Eduardo Abinader --- drivers/net/wireless/ath/ath9k/ar9003_eeprom.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/net/wireless/ath/ath9k/ar9003_eeprom.c b/drivers/net/wireless/ath/ath9k/ar9003_eeprom.c index 5bd2cba..491c352 100644 --- a/drivers/net/wireless/ath/ath9k/ar9003_eeprom.c +++ b/drivers/net/wireless/ath/ath9k/ar9003_eeprom.c @@ -3252,7 +3252,8 @@ static int ar9300_eeprom_restore_flash(struct ath_hw *ah, u8 *mptr, int i; for (i = 0; i < mdata_size / 2; i++, data++) - ath9k_hw_nvram_read(ah, i, data); + if (!ath9k_hw_nvram_read(ah, i, data)) + return -1; return 0; } @@ -3282,7 +3283,8 @@ static int ar9300_eeprom_restore_internal(struct ath_hw *ah, if (ath9k_hw_use_flash(ah)) { u8 txrx; - ar9300_eeprom_restore_flash(ah, mptr, mdata_size); + if (!ar9300_eeprom_restore_flash(ah, mptr, mdata_size)) + return -1; /* check if eeprom contains valid data */ eep = (struct ar9300_eeprom *) mptr; -- 2.5.0