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

Commit 8324147f authored by Johan Hovold's avatar Johan Hovold Committed by Mark Brown
Browse files

spi: fix device-node leaks 



Make sure to release the device-node reference taken in
of_register_spi_device() on errors and when deregistering the device.

Fixes: 284b0189 ("spi: Add OF binding support for SPI busses")
Signed-off-by: default avatarJohan Hovold <johan@kernel.org>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 31ae7794

drivers/spi/spi.c

+6 −2
Original line number Original line Diff line number Diff line
@@ -621,8 +621,10 @@ void spi_unregister_device(struct spi_device *spi) 
	if (!spi)

	if (!spi)

		return;

		return;





	if (spi->dev.of_node)

	if (spi->dev.of_node) {

		of_node_clear_flag(spi->dev.of_node, OF_POPULATED);

		of_node_clear_flag(spi->dev.of_node, OF_POPULATED);

		of_node_put(spi->dev.of_node);

	}

	if (ACPI_COMPANION(&spi->dev))

	if (ACPI_COMPANION(&spi->dev))

		acpi_device_clear_enumerated(ACPI_COMPANION(&spi->dev));

		acpi_device_clear_enumerated(ACPI_COMPANION(&spi->dev));

	device_unregister(&spi->dev);

	device_unregister(&spi->dev);
@@ -1603,11 +1605,13 @@ of_register_spi_device(struct spi_master *master, struct device_node *nc) 
	if (rc) {

	if (rc) {

		dev_err(&master->dev, "spi_device register error %s\n",

		dev_err(&master->dev, "spi_device register error %s\n",

			nc->full_name);

			nc->full_name);

		goto err_out;

		goto err_of_node_put;

	}

	}





	return spi;

	return spi;





err_of_node_put:

	of_node_put(nc);

err_out:

err_out:

	spi_dev_put(spi);

	spi_dev_put(spi);

	return ERR_PTR(rc);

	return ERR_PTR(rc);