From: Mark Brown <broonie@kernel.org>
Date: Wed, 16 Sep 2015 19:44:25 +0000 (+0100)
Subject: Merge tag 'v4.3-rc1' into spi-fix-doc
X-Git-Tag: v4.14-rc1~4638^2~1^4~1
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=92243b6fc8fcb16bf401b055f7a0ba79f70a4115;hp=6ff33f3902c3b1c5d0db6b1e2c70b6d76fba357f;p=platform%2Fkernel%2Flinux-rpi.git

Merge tag 'v4.3-rc1' into spi-fix-doc

Linux 4.3-rc1
---

diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c
index 3abb390..a5f53de 100644
--- a/drivers/spi/spi.c
+++ b/drivers/spi/spi.c
@@ -1610,8 +1610,7 @@ static struct class spi_master_class = {
  *
  * The caller is responsible for assigning the bus number and initializing
  * the master's methods before calling spi_register_master(); and (after errors
- * adding the device) calling spi_master_put() and kfree() to prevent a memory
- * leak.
+ * adding the device) calling spi_master_put() to prevent a memory leak.
  */
 struct spi_master *spi_alloc_master(struct device *dev, unsigned size)
 {