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
5042HARDWARE SPINLOCK CORE5042HARDWARE 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: Maintained5046S: Maintained
5046T: git git://git.kernel.org/pub/scm/linux/kernel/git/ohad/hwspinlock.git5047T: git git://git.kernel.org/pub/scm/linux/kernel/git/ohad/hwspinlock.git
5047F: Documentation/hwspinlock.txt5048F: Documentation/hwspinlock.txt
@@ -9314,6 +9315,7 @@ F: include/linux/regmap.h · 4266 unmodified lines
9314REMOTE PROCESSOR (REMOTEPROC) SUBSYSTEM9315REMOTE 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.git9319T: git git://git.kernel.org/pub/scm/linux/kernel/git/ohad/remoteproc.git
9318S: Maintained9320S: Maintained
9319F: drivers/remoteproc/9321F: drivers/remoteproc/
@@ -9323,6 +9325,7 @@ F: include/linux/remoteproc.h · 3 unmodified lines
9323REMOTE PROCESSOR MESSAGING (RPMSG) SUBSYSTEM9325REMOTE 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.git9329T: git git://git.kernel.org/pub/scm/linux/kernel/git/ohad/rpmsg.git
9327S: Maintained9330S: Maintained
9328F: drivers/rpmsg/9331F: 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
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,