From: Arnd Bergmann <arnd@arndb.de>
Date: Fri, 2 Sep 2016 22:52:11 +0000 (+0200)
Subject: Merge commit 'http://github.com/rogerq/linux gpmc-omap-v4.8-rc1' into next/drivers
X-Git-Tag: v4.9-rc1~77^2~12
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9064a1c77dd3a5c7288b0254a336d6f4073cd996;p=thirdparty%2Fkernel%2Flinux.git

Merge commit 'http://github.com/rogerq/linux gpmc-omap-v4.8-rc1' into next/drivers

This is also going to be part of v4.8 and sent as a bugfix,
merging it here to avoid a small conflict against the other
gpmc changes.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---

9064a1c77dd3a5c7288b0254a336d6f4073cd996
diff --cc drivers/memory/omap-gpmc.c
index c2c32edfed95e,f00f3e7422657..5457c361ad586
--- a/drivers/memory/omap-gpmc.c
+++ b/drivers/memory/omap-gpmc.c
@@@ -2359,19 -2365,15 +2358,13 @@@ static int gpmc_probe(struct platform_d
  	rc = gpmc_setup_irq(gpmc);
  	if (rc) {
  		dev_err(gpmc->dev, "gpmc_setup_irq failed\n");
 -		goto setup_irq_failed;
 +		goto gpio_init_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:
  	gpmc_mem_exit();
  	pm_runtime_put_sync(&pdev->dev);