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)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sun, 8 Oct 2017 08:14:18 +0000 (10:14 +0200)
[ Upstream commit 98ea51cb0c8ce009d9da1fd7b48f0ff1d7a9bbb0 ]

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>
Signed-off-by: Sasha Levin <alexander.levin@verizon.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
arch/mips/lantiq/xway/sysctrl.c

index daf580c..2528181 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_xbar, 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,