Merge branch 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux

gregkh · gregkh · commit a24a0eb9c897 · 2018-10-14T08:33:35.000+02:00
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
diff --git a/drivers/i2c/i2c-core-base.c b/drivers/i2c/i2c-core-base.c
@@ -2270,7 +2270,7 @@ EXPORT_SYMBOL(i2c_put_adapter);
  *
  * Return: NULL if a DMA safe buffer was not obtained. Use msg->buf with PIO.
  *	   Or a valid pointer to be used with DMA. After use, release it by
- *	   calling i2c_release_dma_safe_msg_buf().
+ *	   calling i2c_put_dma_safe_msg_buf().
  *
  * This function must only be called from process context!
  */

Original file line number	Diff line number	Diff line change
`@@ -2270,7 +2270,7 @@ EXPORT_SYMBOL(i2c_put_adapter);`
`2270`	`2270`	`*`
`2271`	`2271`	`* Return: NULL if a DMA safe buffer was not obtained. Use msg->buf with PIO.`
`2272`	`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`	`2275`	`* This function must only be called from process context!`
`2276`	`2276`	`*/`