aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--MAINTAINERS3
-rw-r--r--drivers/remoteproc/st_remoteproc.c4
2 files changed, 5 insertions, 2 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index 7ba7bc485d74..fbd6f5288116 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -5042,6 +5042,7 @@ F: include/linux/hw_random.h
5042HARDWARE SPINLOCK CORE 5042HARDWARE SPINLOCK CORE
5043M: Ohad Ben-Cohen <ohad@wizery.com> 5043M: Ohad Ben-Cohen <ohad@wizery.com>
5044M: Bjorn Andersson <bjorn.andersson@linaro.org> 5044M: Bjorn Andersson <bjorn.andersson@linaro.org>
5045L: linux-remoteproc@vger.kernel.org
5045S: Maintained 5046S: Maintained
5046T: git git://git.kernel.org/pub/scm/linux/kernel/git/ohad/hwspinlock.git 5047T: git git://git.kernel.org/pub/scm/linux/kernel/git/ohad/hwspinlock.git
5047F: Documentation/hwspinlock.txt 5048F: Documentation/hwspinlock.txt
@@ -9314,6 +9315,7 @@ F: include/linux/regmap.h
9314REMOTE PROCESSOR (REMOTEPROC) SUBSYSTEM 9315REMOTE PROCESSOR (REMOTEPROC) SUBSYSTEM
9315M: Ohad Ben-Cohen <ohad@wizery.com> 9316M: Ohad Ben-Cohen <ohad@wizery.com>
9316M: Bjorn Andersson <bjorn.andersson@linaro.org> 9317M: Bjorn Andersson <bjorn.andersson@linaro.org>
9318L: linux-remoteproc@vger.kernel.org
9317T: git git://git.kernel.org/pub/scm/linux/kernel/git/ohad/remoteproc.git 9319T: git git://git.kernel.org/pub/scm/linux/kernel/git/ohad/remoteproc.git
9318S: Maintained 9320S: Maintained
9319F: drivers/remoteproc/ 9321F: drivers/remoteproc/
@@ -9323,6 +9325,7 @@ F: include/linux/remoteproc.h
9323REMOTE PROCESSOR MESSAGING (RPMSG) SUBSYSTEM 9325REMOTE PROCESSOR MESSAGING (RPMSG) SUBSYSTEM
9324M: Ohad Ben-Cohen <ohad@wizery.com> 9326M: Ohad Ben-Cohen <ohad@wizery.com>
9325M: Bjorn Andersson <bjorn.andersson@linaro.org> 9327M: Bjorn Andersson <bjorn.andersson@linaro.org>
9328L: linux-remoteproc@vger.kernel.org
9326T: git git://git.kernel.org/pub/scm/linux/kernel/git/ohad/rpmsg.git 9329T: git git://git.kernel.org/pub/scm/linux/kernel/git/ohad/rpmsg.git
9327S: Maintained 9330S: Maintained
9328F: drivers/rpmsg/ 9331F: drivers/rpmsg/
diff --git a/drivers/remoteproc/st_remoteproc.c b/drivers/remoteproc/st_remoteproc.c
index 6bb04d453247..6f056caa8a56 100644
--- a/drivers/remoteproc/st_remoteproc.c
+++ b/drivers/remoteproc/st_remoteproc.c
@@ -189,9 +189,9 @@ static int st_rproc_parse_dt(struct platform_device *pdev)
189 } 189 }
190 190
191 ddata->boot_base = syscon_regmap_lookup_by_phandle(np, "st,syscfg"); 191 ddata->boot_base = syscon_regmap_lookup_by_phandle(np, "st,syscfg");
192 if (!ddata->boot_base) { 192 if (IS_ERR(ddata->boot_base)) {
193 dev_err(dev, "Boot base not found\n"); 193 dev_err(dev, "Boot base not found\n");
194 return -EINVAL; 194 return PTR_ERR(ddata->boot_base);
195 } 195 }
196 196
197 err = of_property_read_u32_index(np, "st,syscfg", 1, 197 err = of_property_read_u32_index(np, "st,syscfg", 1,