History

Merge tag 'rproc-v4.6-rc1' of git://github.com/andersson/remoteproc

Pull remoteproc fix from Bjorn Andersson: "Fix incorrect error check in the ST remoteproc driver and advertise the newly created linux-remoteproc mailing list" * tag 'rproc-v4.6-rc1' of git://github.com/andersson/remoteproc: MAINTAINERS: Add mailing list for remote processor subsystems remoteproc: st: fix check of syscon_regmap_lookup_by_phandle() return value

Linus Torvalds committed 10 years ago

Commit f7eeb8a2 parents d6c24df d7586842 files · +5 −2Browse files

Unified · Split

2 files
  1. MAINTAINERS +3 −0
  2. drivers/remoteproc/st_remoteproc.c +2 −2
MAINTAINERS+3−0
@@ -5042,6 +5042,7 @@ F: include/linux/hw_random.h · 5041 unmodified lines
50425042 HARDWARE SPINLOCK CORE
50435043 M: Ohad Ben-Cohen <ohad@wizery.com>
50445044 M: Bjorn Andersson <bjorn.andersson@linaro.org>
5045+L: linux-remoteproc@vger.kernel.org
50455046 S: Maintained
50465047 T: git git://git.kernel.org/pub/scm/linux/kernel/git/ohad/hwspinlock.git
50475048 F: Documentation/hwspinlock.txt
@@ -9314,6 +9315,7 @@ F: include/linux/regmap.h · 4266 unmodified lines
93149315 REMOTE PROCESSOR (REMOTEPROC) SUBSYSTEM
93159316 M: Ohad Ben-Cohen <ohad@wizery.com>
93169317 M: Bjorn Andersson <bjorn.andersson@linaro.org>
9318+L: linux-remoteproc@vger.kernel.org
93179319 T: git git://git.kernel.org/pub/scm/linux/kernel/git/ohad/remoteproc.git
93189320 S: Maintained
93199321 F: drivers/remoteproc/
@@ -9323,6 +9325,7 @@ F: include/linux/remoteproc.h · 3 unmodified lines
93239325 REMOTE PROCESSOR MESSAGING (RPMSG) SUBSYSTEM
93249326 M: Ohad Ben-Cohen <ohad@wizery.com>
93259327 M: Bjorn Andersson <bjorn.andersson@linaro.org>
9328+L: linux-remoteproc@vger.kernel.org
93269329 T: git git://git.kernel.org/pub/scm/linux/kernel/git/ohad/rpmsg.git
93279330 S: Maintained
93289331 F: drivers/rpmsg/
drivers/remoteproc/st_remoteproc.c+2−2
@@ -189,9 +189,9 @@ static int st_rproc_parse_dt(struct platform_device *pdev) · 188 unmodified lines
189189 }
190190
191191 ddata->boot_base = syscon_regmap_lookup_by_phandle(np, "st,syscfg");
192− if (!ddata->boot_base) {
192+ if (IS_ERR(ddata->boot_base)) {
193193 dev_err(dev, "Boot base not found\n");
194− return -EINVAL;
194+ return PTR_ERR(ddata->boot_base);
195195 }
196196
197197 err = of_property_read_u32_index(np, "st,syscfg", 1,