Skip to content

Commit e7839f7

Browse files
Dan Carpenterandersson
authored andcommitted
remoteproc: qcom: pas: Fix a couple NULL vs IS_ERR() bugs
The devm_ioremap_resource_wc() function never returns NULL, it returns error pointers. Update the checking to match. Fixes: c70b9d5 ("remoteproc: qcom: Use of_reserved_mem_region_* functions for "memory-region"") Signed-off-by: Dan Carpenter <dan.carpenter@linaro.org> Link: https://lore.kernel.org/r/0599691acc394d9390da8fa0b5de3399b132b187.1764427595.git.dan.carpenter@linaro.org Signed-off-by: Bjorn Andersson <andersson@kernel.org>
1 parent 5e6fee7 commit e7839f7

1 file changed

Lines changed: 4 additions & 4 deletions

File tree

drivers/remoteproc/qcom_q6v5_pas.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -559,9 +559,9 @@ static int qcom_pas_alloc_memory_region(struct qcom_pas *pas)
559559
pas->mem_phys = pas->mem_reloc = res.start;
560560
pas->mem_size = resource_size(&res);
561561
pas->mem_region = devm_ioremap_resource_wc(pas->dev, &res);
562-
if (!pas->mem_region) {
562+
if (IS_ERR(pas->mem_region)) {
563563
dev_err(pas->dev, "unable to map memory region: %pR\n", &res);
564-
return -EBUSY;
564+
return PTR_ERR(pas->mem_region);
565565
}
566566

567567
if (!pas->dtb_pas_id)
@@ -576,9 +576,9 @@ static int qcom_pas_alloc_memory_region(struct qcom_pas *pas)
576576
pas->dtb_mem_phys = pas->dtb_mem_reloc = res.start;
577577
pas->dtb_mem_size = resource_size(&res);
578578
pas->dtb_mem_region = devm_ioremap_resource_wc(pas->dev, &res);
579-
if (!pas->dtb_mem_region) {
579+
if (IS_ERR(pas->dtb_mem_region)) {
580580
dev_err(pas->dev, "unable to map dtb memory region: %pR\n", &res);
581-
return -EBUSY;
581+
return PTR_ERR(pas->dtb_mem_region);
582582
}
583583

584584
return 0;

0 commit comments

Comments
 (0)