summaryrefslogtreecommitdiffstats
path: root/drivers/memory
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2018-05-14 01:29:15 -0700
committerOlof Johansson <olof@lixom.net>2018-05-14 01:29:15 -0700
commit7a0b8610d3243fe4fc2422f5e4658676c3d9c6ab (patch)
tree56de21314e7d8a3756b730ed55257cb49d654a8f /drivers/memory
parent71fe67e0e23446074e61a10e1fec21dd297d49fa (diff)
parentd507178f2ebb7bde5b3f64557f1c8f80e7b82541 (diff)
downloadlinux-7a0b8610d3243fe4fc2422f5e4658676c3d9c6ab.tar.gz
linux-7a0b8610d3243fe4fc2422f5e4658676c3d9c6ab.tar.bz2
linux-7a0b8610d3243fe4fc2422f5e4658676c3d9c6ab.zip
Merge tag 'gpmc-omap-for-v4.18' of https://github.com/rogerq/linux into next/drivers
OMAP-GPMC: driver updates for v4.18 * get rid of a redundant NULL check in gpmc_probe_dt_children() * tag 'gpmc-omap-for-v4.18' of https://github.com/rogerq/linux: memory: omap-gpmc: Avoid redundant NULL check Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'drivers/memory')
-rw-r--r--drivers/memory/omap-gpmc.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/memory/omap-gpmc.c b/drivers/memory/omap-gpmc.c
index 90a66b3f7ae1..c215287e80cf 100644
--- a/drivers/memory/omap-gpmc.c
+++ b/drivers/memory/omap-gpmc.c
@@ -2060,8 +2060,8 @@ static int gpmc_probe_generic_child(struct platform_device *pdev,
* timings.
*/
name = gpmc_cs_get_name(cs);
- if (name && child->name && of_node_cmp(child->name, name) == 0)
- goto no_timings;
+ if (name && of_node_cmp(child->name, name) == 0)
+ goto no_timings;
ret = gpmc_cs_request(cs, resource_size(&res), &base);
if (ret < 0) {