| Message ID | 490b6e07-d357-7985-8796-80125322e82e@riverbed.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | a5d268277ad566cbcf53a2e6f05fd6db81a61c41 |
| Delegated to: | Kalle Valo |
| Headers | show |
Eduardo Abinader <eduardo.abinader@riverbed.com> wrote: > just to comply with current ath9k_hw_nvram_read to return value, hence > behaving reacting accordingly. > > Signed-off-by: Eduardo Abinader <eduardo.abinader@riverbed.com> Thanks, 1 patch applied to ath-next branch of ath.git: a5d268277ad5 ath9k: consider return code on
diff --git a/drivers/net/wireless/ath/ath9k/ar9003_eeprom.c b/drivers/net/wireless/ath/ath9k/ar9003_eeprom.c index 5bd2cba..08607d7 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 -EIO; 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 -EIO; /* check if eeprom contains valid data */ eep = (struct ar9300_eeprom *) mptr;
just to comply with current ath9k_hw_nvram_read to return value, hence behaving reacting accordingly. Signed-off-by: Eduardo Abinader <eduardo.abinader@riverbed.com> --- drivers/net/wireless/ath/ath9k/ar9003_eeprom.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)