diff options
| author |   Johan Hovold <johan@kernel.org> | 2017-01-30 17:47:05 +0100 |
|---|---|---|
| committer |   Mark Brown <broonie@kernel.org> | 2017-01-31 21:00:58 +0000 |
| commit | 8324147f38019865b29d03baf28412d2ec0bd828 (patch) | |
| tree | 4f13ea84e653d9b69d58d8b31c238dd8dfec61ff /drivers/spi | |
| parent | spi: fsl: Combine substrings for two messages (diff) | |
| download | linux-dev-8324147f38019865b29d03baf28412d2ec0bd828.tar.xz linux-dev-8324147f38019865b29d03baf28412d2ec0bd828.zip | |
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: 284b01897340 ("spi: Add OF binding support for SPI busses")
Signed-off-by: Johan Hovold <johan@kernel.org>
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'drivers/spi')
| -rw-r--r-- | drivers/spi/spi.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c index 8c05f27bf642..59cb26470d70 100644 --- a/drivers/spi/spi.c +++ b/drivers/spi/spi.c @@ -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); |