diff options
| -rw-r--r-- | MAINTAINERS | 3 | ||||
| -rw-r--r-- | drivers/remoteproc/st_remoteproc.c | 4 |
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 | |||
| 5042 | HARDWARE SPINLOCK CORE | 5042 | HARDWARE SPINLOCK CORE |
| 5043 | M: Ohad Ben-Cohen <ohad@wizery.com> | 5043 | M: Ohad Ben-Cohen <ohad@wizery.com> |
| 5044 | M: Bjorn Andersson <bjorn.andersson@linaro.org> | 5044 | M: Bjorn Andersson <bjorn.andersson@linaro.org> |
| 5045 | L: linux-remoteproc@vger.kernel.org | ||
| 5045 | S: Maintained | 5046 | S: Maintained |
| 5046 | T: git git://git.kernel.org/pub/scm/linux/kernel/git/ohad/hwspinlock.git | 5047 | T: git git://git.kernel.org/pub/scm/linux/kernel/git/ohad/hwspinlock.git |
| 5047 | F: Documentation/hwspinlock.txt | 5048 | F: Documentation/hwspinlock.txt |
| @@ -9314,6 +9315,7 @@ F: include/linux/regmap.h | |||
| 9314 | REMOTE PROCESSOR (REMOTEPROC) SUBSYSTEM | 9315 | REMOTE PROCESSOR (REMOTEPROC) SUBSYSTEM |
| 9315 | M: Ohad Ben-Cohen <ohad@wizery.com> | 9316 | M: Ohad Ben-Cohen <ohad@wizery.com> |
| 9316 | M: Bjorn Andersson <bjorn.andersson@linaro.org> | 9317 | M: Bjorn Andersson <bjorn.andersson@linaro.org> |
| 9318 | L: linux-remoteproc@vger.kernel.org | ||
| 9317 | T: git git://git.kernel.org/pub/scm/linux/kernel/git/ohad/remoteproc.git | 9319 | T: git git://git.kernel.org/pub/scm/linux/kernel/git/ohad/remoteproc.git |
| 9318 | S: Maintained | 9320 | S: Maintained |
| 9319 | F: drivers/remoteproc/ | 9321 | F: drivers/remoteproc/ |
| @@ -9323,6 +9325,7 @@ F: include/linux/remoteproc.h | |||
| 9323 | REMOTE PROCESSOR MESSAGING (RPMSG) SUBSYSTEM | 9325 | REMOTE PROCESSOR MESSAGING (RPMSG) SUBSYSTEM |
| 9324 | M: Ohad Ben-Cohen <ohad@wizery.com> | 9326 | M: Ohad Ben-Cohen <ohad@wizery.com> |
| 9325 | M: Bjorn Andersson <bjorn.andersson@linaro.org> | 9327 | M: Bjorn Andersson <bjorn.andersson@linaro.org> |
| 9328 | L: linux-remoteproc@vger.kernel.org | ||
| 9326 | T: git git://git.kernel.org/pub/scm/linux/kernel/git/ohad/rpmsg.git | 9329 | T: git git://git.kernel.org/pub/scm/linux/kernel/git/ohad/rpmsg.git |
| 9327 | S: Maintained | 9330 | S: Maintained |
| 9328 | F: drivers/rpmsg/ | 9331 | F: 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, |
