Skip to content

Commit 6e80785

Browse files
Hauke Mehrtensralfbaechle
authored andcommitted
MIPS: Lantiq: Fix check for return value of request_mem_region()
request_mem_region() returns a pointer and not an integer with an error value. A check for "< 0" on a pointer will cause problems, replace it with not null checks instead. This was found with sparse. Signed-off-by: Hauke Mehrtens <[email protected]> Acked-by: John Crispin <[email protected]> Cc: [email protected] Patchwork: https://patchwork.linux-mips.org/patch/11395/ Signed-off-by: Ralf Baechle <[email protected]>
1 parent 13648d7 commit 6e80785

File tree

3 files changed

+11
-11
lines changed

3 files changed

+11
-11
lines changed

arch/mips/lantiq/irq.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -369,8 +369,8 @@ int __init icu_of_init(struct device_node *node, struct device_node *parent)
369369
if (of_address_to_resource(node, i, &res))
370370
panic("Failed to get icu memory range");
371371

372-
if (request_mem_region(res.start, resource_size(&res),
373-
res.name) < 0)
372+
if (!request_mem_region(res.start, resource_size(&res),
373+
res.name))
374374
pr_err("Failed to request icu memory");
375375

376376
ltq_icu_membase[i] = ioremap_nocache(res.start,
@@ -449,8 +449,8 @@ int __init icu_of_init(struct device_node *node, struct device_node *parent)
449449
if (ret != exin_avail)
450450
panic("failed to load external irq resources");
451451

452-
if (request_mem_region(res.start, resource_size(&res),
453-
res.name) < 0)
452+
if (!request_mem_region(res.start, resource_size(&res),
453+
res.name))
454454
pr_err("Failed to request eiu memory");
455455

456456
ltq_eiu_membase = ioremap_nocache(res.start,

arch/mips/lantiq/xway/reset.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -288,7 +288,7 @@ static int __init mips_reboot_setup(void)
288288
if (of_address_to_resource(ltq_rcu_np, 0, &res))
289289
panic("Failed to get rcu memory range");
290290

291-
if (request_mem_region(res.start, resource_size(&res), res.name) < 0)
291+
if (!request_mem_region(res.start, resource_size(&res), res.name))
292292
pr_err("Failed to request rcu memory");
293293

294294
ltq_rcu_membase = ioremap_nocache(res.start, resource_size(&res));

arch/mips/lantiq/xway/sysctrl.c

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -425,12 +425,12 @@ void __init ltq_soc_init(void)
425425
of_address_to_resource(np_ebu, 0, &res_ebu))
426426
panic("Failed to get core resources");
427427

428-
if ((request_mem_region(res_pmu.start, resource_size(&res_pmu),
429-
res_pmu.name) < 0) ||
430-
(request_mem_region(res_cgu.start, resource_size(&res_cgu),
431-
res_cgu.name) < 0) ||
432-
(request_mem_region(res_ebu.start, resource_size(&res_ebu),
433-
res_ebu.name) < 0))
428+
if (!request_mem_region(res_pmu.start, resource_size(&res_pmu),
429+
res_pmu.name) ||
430+
!request_mem_region(res_cgu.start, resource_size(&res_cgu),
431+
res_cgu.name) ||
432+
!request_mem_region(res_ebu.start, resource_size(&res_ebu),
433+
res_ebu.name))
434434
pr_err("Failed to request core resources");
435435

436436
pmu_membase = ioremap_nocache(res_pmu.start, resource_size(&res_pmu));

0 commit comments

Comments
 (0)