OSDN Git Service

ath9k: Fix error check in ath9k_hw_read_revisions() for PCI devices
authorToke Høiland-Jørgensen <toke@redhat.com>
Fri, 26 Mar 2021 18:08:19 +0000 (19:08 +0100)
committerKalle Valo <kvalo@codeaurora.org>
Thu, 22 Apr 2021 13:37:54 +0000 (16:37 +0300)
commit7dd9a40fd6e0d0f1fd8e1931c007e080801dfdce
tree50f6a8344e19eb8b5aefa1a523caf737c2e5e828
parentafda33499bea154dc792338c5c51a2038a206785
ath9k: Fix error check in ath9k_hw_read_revisions() for PCI devices

When the error check in ath9k_hw_read_revisions() was added, it checked for
-EIO which is what ath9k_regread() in the ath9k_htc driver uses. However,
for plain ath9k, the register read function uses ioread32(), which just
returns -1 on error. So if such a read fails, it still gets passed through
and ends up as a weird mac revision in the log output.

Fix this by changing ath9k_regread() to return -1 on error like ioread32()
does, and fix the error check to look for that instead of -EIO.

Fixes: 2f90c7e5d094 ("ath9k: Check for errors when reading SREV register")
Signed-off-by: Toke Høiland-Jørgensen <toke@redhat.com>
Reviewed-by: Lorenzo Bianconi <lorenzo@kernel.org>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
Link: https://lore.kernel.org/r/20210326180819.142480-1-toke@redhat.com
drivers/net/wireless/ath/ath9k/htc_drv_init.c
drivers/net/wireless/ath/ath9k/hw.c