Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7a0b8610 authored by Olof Johansson's avatar Olof Johansson
Browse files

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: default avatarOlof Johansson <olof@lixom.net>
parents 71fe67e0 d507178f
Loading
Loading
Loading
Loading
+2 −2
Original line number Diff line number Diff line
@@ -2060,7 +2060,7 @@ 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)
	if (name && of_node_cmp(child->name, name) == 0)
		goto no_timings;

	ret = gpmc_cs_request(cs, resource_size(&res), &base);