Patch "memory: omap-gpmc: allow probe of child nodes to fail" has been added to the 4.7-stable tree

This is a note to let you know that I've just added the patch titled

memory: omap-gpmc: allow probe of child nodes to fail

to the 4.7-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
memory-omap-gpmc-allow-probe-of-child-nodes-to-fail.patch
and it can be found in the queue-4.7 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

From: Johan Hovold <[email protected]>
Date: Sun, 24 Jul 2016 14:10:58 +0200
Subject: memory: omap-gpmc: allow probe of child nodes to fail

From: Johan Hovold <[email protected]>

commit 23540d6e2f3193b946c4de43e3f9654fa6d23fe7 upstream.

A recent commit (inadvertently?) changed how failed probe of a gpmc child node was handled. Instead of proceeding with setting up any other children as before, a single error now aborts the whole process.

This change broke networking on some Overo boards due to probe failing for an unrelated nand node. This second issue should obviously be fixed, but let's restore the old behaviour of allowing child-node probe to fail to avoid further similar breakage on other systems.

for WAITPINs")

---
 drivers/memory/omap-gpmc.c |   21 +++++++--------------
 1 file changed, 7 insertions(+), 14 deletions(-)

@@ -2250,7 +2250,7 @@ static int gpmc_probe_dt(struct platform
 	return 0;
 }
 
-static int gpmc_probe_dt_children(struct platform_device *pdev)
+static void gpmc_probe_dt_children(struct platform_device *pdev)
 {
 	int ret;
 	struct device_node *child;

@@ -2265,11 +2265,11 @@ static int gpmc_probe_dt_children(struct
 		else
 			ret = gpmc_probe_generic_child(pdev, child);
 
-		if (ret)
-			return ret;
+		if (ret) {
+			dev_err(&pdev->dev, "failed to probe DT child '%s': %d\n",
+				child->name, ret);
+		}
 	}
-
-	return 0;
 }
 #else
 static int gpmc_probe_dt(struct platform_device *pdev)

@@ -2277,9 +2277,8 @@ static int gpmc_probe_dt(struct platform
 	return 0;
 }
 
-static int gpmc_probe_dt_children(struct platform_device *pdev)
+static void gpmc_probe_dt_children(struct platform_device *pdev)
 {
-	return 0;
 }
 #endif
 

@@ -2372,16 +2371,10 @@ static int gpmc_probe(struct platform_de
 		goto setup_irq_failed;
 	}
 
-	rc = gpmc_probe_dt_children(pdev);
-	if (rc < 0) {
-		dev_err(gpmc->dev, "failed to probe DT children\n");
-		goto dt_children_failed;
-	}
+	gpmc_probe_dt_children(pdev);
 
 	return 0;
 
-dt_children_failed:
-	gpmc_free_irq(gpmc);
 setup_irq_failed:
 	gpmc_gpio_exit(gpmc);
 gpio_init_failed:

Patches currently in stable-queue which might be from [email protected] are

queue-4.7/memory-omap-gpmc-allow-probe-of-child-nodes-to-fail.patch queue-4.7/usb-serial-simple-add-support-for-another-infineon-flashloader.patch queue-4.7/arm-dts-overo-fix-gpmc-nand-on-boards-with-ethernet.patch queue-4.7/arm-dts-overo-fix-gpmc-nand-cs0-range.patch