| From 91851cc7a939039bd401adb6ca3da4402bec1d0c Mon Sep 17 00:00:00 2001 |
| From: Matthias Schiffer <mschiffer@universe-factory.net> |
| Date: Tue, 15 Nov 2016 18:47:21 +0100 |
| Subject: ath9k: fix ath9k_hw_gpio_get() to return 0 or 1 on success |
| |
| From: Matthias Schiffer <mschiffer@universe-factory.net> |
| |
| commit 91851cc7a939039bd401adb6ca3da4402bec1d0c upstream. |
| |
| Commit b2d70d4944c1 ("ath9k: make GPIO API to support both of WMAC and |
| SOC") refactored ath9k_hw_gpio_get() to support both WMAC and SOC GPIOs, |
| changing the return on success from 1 to BIT(gpio). This broke some callers |
| like ath_is_rfkill_set(). This doesn't fix any known bug in mainline at the |
| moment, but should be fixed anyway. |
| |
| Instead of fixing all callers, change ath9k_hw_gpio_get() back to only |
| return 0 or 1. |
| |
| Fixes: b2d70d4944c1 ("ath9k: make GPIO API to support both of WMAC and SOC") |
| Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net> |
| [kvalo@qca.qualcomm.com: mention that doesn't fix any known bug] |
| Signed-off-by: Kalle Valo <kvalo@qca.qualcomm.com> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| drivers/net/wireless/ath/ath9k/hw.c | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| --- a/drivers/net/wireless/ath/ath9k/hw.c |
| +++ b/drivers/net/wireless/ath/ath9k/hw.c |
| @@ -2792,7 +2792,7 @@ u32 ath9k_hw_gpio_get(struct ath_hw *ah, |
| WARN_ON(1); |
| } |
| |
| - return val; |
| + return !!val; |
| } |
| EXPORT_SYMBOL(ath9k_hw_gpio_get); |
| |
