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

f7eeb8a8 · Linus Torvalds <[email protected]> · 2016-04-02 18:57:49 -05:00

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

Commit: f7eeb8a87c033d126ff6b8c35405ba5dc4e55754
Parents: d6c24df0 · d7586849

Merge commit. Changes below are compared with the first parent: d6c24df0.

Changes

2 files changed · +5 −2

File	Status	Add	Del	Content
MAINTAINERS	modified	+3	−0	View file
drivers/remoteproc/st_remoteproc.c	modified	+2	−2	View file

MAINTAINERS

View file

diff --git a/MAINTAINERS b/MAINTAINERS
index 7ba7bc4..fbd6f52 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -5042,6 +5042,7 @@ F:	include/linux/hw_random.h
 HARDWARE SPINLOCK CORE
 M:	Ohad Ben-Cohen <[email protected]>
 M:	Bjorn Andersson <[email protected]>
+L:	[email protected]
 S:	Maintained
 T:	git git://git.kernel.org/pub/scm/linux/kernel/git/ohad/hwspinlock.git
 F:	Documentation/hwspinlock.txt
@@ -9314,6 +9315,7 @@ F:	include/linux/regmap.h
 REMOTE PROCESSOR (REMOTEPROC) SUBSYSTEM
 M:	Ohad Ben-Cohen <[email protected]>
 M:	Bjorn Andersson <[email protected]>
+L:	[email protected]
 T:	git git://git.kernel.org/pub/scm/linux/kernel/git/ohad/remoteproc.git
 S:	Maintained
 F:	drivers/remoteproc/
@@ -9323,6 +9325,7 @@ F:	include/linux/remoteproc.h
 REMOTE PROCESSOR MESSAGING (RPMSG) SUBSYSTEM
 M:	Ohad Ben-Cohen <[email protected]>
 M:	Bjorn Andersson <[email protected]>
+L:	[email protected]
 T:	git git://git.kernel.org/pub/scm/linux/kernel/git/ohad/rpmsg.git
 S:	Maintained
 F:	drivers/rpmsg/

drivers/remoteproc/st_remoteproc.c

View file

diff --git a/drivers/remoteproc/st_remoteproc.c b/drivers/remoteproc/st_remoteproc.c
index 6bb04d4..6f056ca 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)
 	}
 
 	ddata->boot_base = syscon_regmap_lookup_by_phandle(np, "st,syscfg");
-	if (!ddata->boot_base) {
+	if (IS_ERR(ddata->boot_base)) {
 		dev_err(dev, "Boot base not found\n");
-		return -EINVAL;
+		return PTR_ERR(ddata->boot_base);
 	}
 
 	err = of_property_read_u32_index(np, "st,syscfg", 1,