diff options
author | Mark Brown <broonie@kernel.org> | 2017-11-10 16:33:43 -0500 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2017-11-10 16:33:43 -0500 |
commit | b5f9208dea865ffdd075c55c6e44fcf5e45134b3 (patch) | |
tree | dbe4528b0dc80579375319722bc12f68e0d41443 | |
parent | 130555cf3b13ad9e187f52a2a3780af9d3b8714c (diff) | |
parent | 68b892f1fdc493d7cd4e4067596879cd097c1f62 (diff) |
Merge remote-tracking branch 'spi/topic/core' into spi-next
-rw-r--r-- | drivers/spi/spi.c | 4 |
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) | |||
2200 | * Context: can sleep | 2200 | * Context: can sleep |
2201 | * | 2201 | * |
2202 | * Register a SPI device as with spi_register_controller() which will | 2202 | * Register a SPI device as with spi_register_controller() which will |
2203 | * automatically be unregister | 2203 | * automatically be unregistered and freed. |
2204 | * | 2204 | * |
2205 | * Return: zero on success, else a negative error code. | 2205 | * Return: zero on success, else a negative error code. |
2206 | */ | 2206 | */ |
@@ -2241,6 +2241,8 @@ static int __unregister(struct device *dev, void *null) | |||
2241 | * only ones directly touching chip registers. | 2241 | * only ones directly touching chip registers. |
2242 | * | 2242 | * |
2243 | * This must be called from context that can sleep. | 2243 | * This must be called from context that can sleep. |
2244 | * | ||
2245 | * Note that this function also drops a reference to the controller. | ||
2244 | */ | 2246 | */ |
2245 | void spi_unregister_controller(struct spi_controller *ctlr) | 2247 | void spi_unregister_controller(struct spi_controller *ctlr) |
2246 | { | 2248 | { |