Commit e0af98a7 authored Oct 17, 2016 by Ralf Ramsauer Committed by Mark Brown Oct 24, 2016

spi: mark device nodes only in case of successful instantiation



Instantiated SPI device nodes are marked with OF_POPULATE. This was
introduced in bd6c1644. On unloading, loaded device nodes will of course
be unmarked. The problem are nodes that fail during initialisation: If a
node fails, it won't be unloaded and hence not be unmarked.

If a SPI driver module is unloaded and reloaded, it will skip nodes that
failed before.

Skip device nodes that are already populated and mark them only in case
of success.

Note that the same issue exists for I2C.

Fixes: bd6c1644 ("spi: Mark instantiated device nodes with OF_POPULATE")
Signed-off-by: Ralf Ramsauer <ralf@ramses-pyramidenbau.de>
Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be>
Acked-by: Pantelis Antoniou <pantelis.antoniou@konsulko.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
Cc: stable@vger.kernel.org

parent 1001354c

drivers/spi/spi.c

+4 −1

Original line number	Diff line number	Diff line
		@@ -1618,9 +1618,11 @@ static void of_register_spi_devices(struct spi_master *master)
		if (of_node_test_and_set_flag(nc, OF_POPULATED))
		continue;
		spi = of_register_spi_device(master, nc);
		if (IS_ERR(spi))
		if (IS_ERR(spi)) {
		dev_warn(&master->dev, "Failed to create SPI device for %s\n",
		nc->full_name);
		of_node_clear_flag(nc, OF_POPULATED);
		}
		}
		}
		#else
		@@ -3131,6 +3133,7 @@ static int of_spi_notify(struct notifier_block *nb, unsigned long action,
		if (IS_ERR(spi)) {
		pr_err("%s: failed to create for '%s'\n",
		__func__, rd->dn->full_name);
		of_node_clear_flag(rd->dn, OF_POPULATED);
		return notifier_from_errno(PTR_ERR(spi));
		}
		break;

Admin message