summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorIlpo Järvinen <ilpo.jarvinen@linux.intel.com>2024-05-08 15:07:00 +0300
committerThomas Bogendoerfer <tsbogend@alpha.franken.de>2024-06-11 16:04:55 +0200
commitae9daffd9028f2500c9ac1517e46d4f2b57efb80 (patch)
treef5aa79f9be663ecc6fedb103c71799521d53fe0d /arch
parent83a7eefedc9b56fe7bfeff13b6c7356688ffa670 (diff)
downloadlinux-stable-ae9daffd9028f2500c9ac1517e46d4f2b57efb80.tar.gz
linux-stable-ae9daffd9028f2500c9ac1517e46d4f2b57efb80.tar.bz2
linux-stable-ae9daffd9028f2500c9ac1517e46d4f2b57efb80.zip
MIPS: Routerboard 532: Fix vendor retry check code
read_config_dword() contains strange condition checking ret for a number of values. The ret variable, however, is always zero because config_access() never returns anything else. Thus, the retry is always taken until number of tries is exceeded. The code looks like it wants to check *val instead of ret to see if the read gave an error response. Fixes: 73b4390fb234 ("[MIPS] Routerboard 532: Support for base system") Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com> Signed-off-by: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
Diffstat (limited to 'arch')
-rw-r--r--arch/mips/pci/ops-rc32434.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/mips/pci/ops-rc32434.c b/arch/mips/pci/ops-rc32434.c
index 874ed6df9768..34b9323bdabb 100644
--- a/arch/mips/pci/ops-rc32434.c
+++ b/arch/mips/pci/ops-rc32434.c
@@ -112,8 +112,8 @@ retry:
* gives them time to settle
*/
if (where == PCI_VENDOR_ID) {
- if (ret == 0xffffffff || ret == 0x00000000 ||
- ret == 0x0000ffff || ret == 0xffff0000) {
+ if (*val == 0xffffffff || *val == 0x00000000 ||
+ *val == 0x0000ffff || *val == 0xffff0000) {
if (delay > 4)
return 0;
delay *= 2;