summaryrefslogtreecommitdiffstats
path: root/drivers/spi
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2017-11-10 21:33:43 +0000
committerMark Brown <broonie@kernel.org>2017-11-10 21:33:43 +0000
commitb5f9208dea865ffdd075c55c6e44fcf5e45134b3 (patch)
treedbe4528b0dc80579375319722bc12f68e0d41443 /drivers/spi
parent130555cf3b13ad9e187f52a2a3780af9d3b8714c (diff)
parent68b892f1fdc493d7cd4e4067596879cd097c1f62 (diff)
downloadlinux-b5f9208dea865ffdd075c55c6e44fcf5e45134b3.tar.bz2
Merge remote-tracking branch 'spi/topic/core' into spi-next
Diffstat (limited to 'drivers/spi')
-rw-r--r--drivers/spi/spi.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c
index 3ff0ee88c467..b33a727a0158 100644
--- a/drivers/spi/spi.c
+++ b/drivers/spi/spi.c
@@ -2200,7 +2200,7 @@ static void devm_spi_unregister(struct device *dev, void *res)
* Context: can sleep
*
* Register a SPI device as with spi_register_controller() which will
- * automatically be unregister
+ * automatically be unregistered and freed.
*
* Return: zero on success, else a negative error code.
*/
@@ -2241,6 +2241,8 @@ static int __unregister(struct device *dev, void *null)
* only ones directly touching chip registers.
*
* This must be called from context that can sleep.
+ *
+ * Note that this function also drops a reference to the controller.
*/
void spi_unregister_controller(struct spi_controller *ctlr)
{