|
|
@@ -621,8 +621,10 @@ void spi_unregister_device(struct spi_device *spi)
|
|
|
if (!spi)
|
|
|
return;
|
|
|
|
|
|
- if (spi->dev.of_node)
|
|
|
+ if (spi->dev.of_node) {
|
|
|
of_node_clear_flag(spi->dev.of_node, OF_POPULATED);
|
|
|
+ of_node_put(spi->dev.of_node);
|
|
|
+ }
|
|
|
if (ACPI_COMPANION(&spi->dev))
|
|
|
acpi_device_clear_enumerated(ACPI_COMPANION(&spi->dev));
|
|
|
device_unregister(&spi->dev);
|
|
|
@@ -1603,11 +1605,13 @@ of_register_spi_device(struct spi_master *master, struct device_node *nc)
|
|
|
if (rc) {
|
|
|
dev_err(&master->dev, "spi_device register error %s\n",
|
|
|
nc->full_name);
|
|
|
- goto err_out;
|
|
|
+ goto err_of_node_put;
|
|
|
}
|
|
|
|
|
|
return spi;
|
|
|
|
|
|
+err_of_node_put:
|
|
|
+ of_node_put(nc);
|
|
|
err_out:
|
|
|
spi_dev_put(spi);
|
|
|
return ERR_PTR(rc);
|