summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2016-04-02 18:57:49 -0500
committerLinus Torvalds <torvalds@linux-foundation.org>2016-04-02 18:57:49 -0500
commitf7eeb8a87c033d126ff6b8c35405ba5dc4e55754 (patch)
tree54e0d1a772b7866f7b1a64f37a6a9f6bd6742caa /drivers
parentd6c24df08255e24dbd19b52dd322f61fbc30b11d (diff)
parentd75868496ca0af1685f31726d8f5b5037c092a7a (diff)
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
Diffstat (limited to 'drivers')
-rw-r--r--drivers/remoteproc/st_remoteproc.c4
1 files changed, 2 insertions, 2 deletions
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)
}
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,