]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
MIPS: Lantiq: Fix another request_mem_region() return code check
authorArnd Bergmann <arnd@arndb.de>
Tue, 17 Jan 2017 15:18:40 +0000 (16:18 +0100)
committerRalf Baechle <ralf@linux-mips.org>
Wed, 25 Jan 2017 01:51:10 +0000 (02:51 +0100)
Hauke already fixed a couple of them, but one instance remains
that checks for a negative integer when it should check
for a NULL pointer:

arch/mips/lantiq/xway/sysctrl.c: In function 'ltq_soc_init':
arch/mips/lantiq/xway/sysctrl.c:473:19: error: ordered comparison of pointer with integer zero [-Werror=extra]

Fixes: 6e807852676a ("MIPS: Lantiq: Fix check for return value of request_mem_region()")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Cc: John Crispin <john@phrozen.org>
Cc: linux-mips@linux-mips.org
Cc: linux-kernel@vger.kernel.org
Patchwork: https://patchwork.linux-mips.org/patch/15043/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
arch/mips/lantiq/xway/sysctrl.c

index 236193b5210b0f48e78faaa42bf9fd83bc6e050e..ba9f358fa21b75f7a98b1379a5a09598555e4d27 100644 (file)
@@ -469,8 +469,8 @@ void __init ltq_soc_init(void)
                        panic("Failed to load xbar nodes from devicetree");
                if (of_address_to_resource(np_pmu, 0, &res_xbar))
                        panic("Failed to get xbar resources");
-               if (request_mem_region(res_xbar.start, resource_size(&res_xbar),
-                       res_xbar.name) < 0)
+               if (!request_mem_region(res_xbar.start, resource_size(&res_xbar),
+                       res_xbar.name))
                        panic("Failed to get xbar resources");
 
                ltq_xbar_membase = ioremap_nocache(res_xbar.start,