diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-10-14 02:33:35 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-10-14 02:33:35 -0400 |
| commit | a24a0eb9c8972803a8707041fc9ed9080cdaf1b9 (patch) | |
| tree | f95b8985e49ec52dff9425e53f6a18c598d677fa | |
| parent | 7ec21823634d7cb7ea20539b877c0d31830c6ad4 (diff) | |
| parent | 34d1b82cd198379545ca634119e296fce06252aa (diff) | |
Merge branch 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux
Wolfram writes:
"i2c fix for 4.19:
I2C has one documentation bugfix for something we changed during the
v4.19 cycle"
* 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux:
i2c: Fix kerneldoc for renamed i2c dma put function
| -rw-r--r-- | drivers/i2c/i2c-core-base.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/i2c/i2c-core-base.c b/drivers/i2c/i2c-core-base.c index 9ee9a15e7134..9200e349f29e 100644 --- a/drivers/i2c/i2c-core-base.c +++ b/drivers/i2c/i2c-core-base.c | |||
| @@ -2270,7 +2270,7 @@ EXPORT_SYMBOL(i2c_put_adapter); | |||
| 2270 | * | 2270 | * |
| 2271 | * Return: NULL if a DMA safe buffer was not obtained. Use msg->buf with PIO. | 2271 | * Return: NULL if a DMA safe buffer was not obtained. Use msg->buf with PIO. |
| 2272 | * Or a valid pointer to be used with DMA. After use, release it by | 2272 | * Or a valid pointer to be used with DMA. After use, release it by |
| 2273 | * calling i2c_release_dma_safe_msg_buf(). | 2273 | * calling i2c_put_dma_safe_msg_buf(). |
| 2274 | * | 2274 | * |
| 2275 | * This function must only be called from process context! | 2275 | * This function must only be called from process context! |
| 2276 | */ | 2276 | */ |