[PATCH V2] ath9k: consider return code on ar9300_eeprom_restore_flash

2016-07-01 Thread Eduardo Abinader
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..b7dc08e 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
--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html


Re: [PATCH V2] ath9k: consider return code on ar9300_eeprom_restore_flash

2016-07-08 Thread Kalle Valo
Eduardo Abinader  writes:

> 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(-)

Please always provide a changelog after the "---" line or in the cover
letter.

> diff --git a/drivers/net/wireless/ath/ath9k/ar9003_eeprom.c 
> b/drivers/net/wireless/ath/ath9k/ar9003_eeprom.c
> index 5bd2cba..b7dc08e 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;

Please use proper error codes, like -EIO or some other.

>   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;

And here you can just return the error code:

ret = ar9300_eeprom_restore_flash(ah, mptr, mdata_size);
if (ret)
return ret;

-- 
Kalle Valo
--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html