diff --git a/[refs] b/[refs] index b1706fced842..40ffdc7ea745 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8f53602be555e500cfcd957955bb40fac19f2a6b +refs/heads/master: eb4af0f5349235df2e4a5057a72fc8962d00308a diff --git a/trunk/drivers/spi/spi.c b/trunk/drivers/spi/spi.c index 5ae1e84d9037..c12a9dba2d82 100644 --- a/trunk/drivers/spi/spi.c +++ b/trunk/drivers/spi/spi.c @@ -830,7 +830,8 @@ 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() to prevent a memory leak. + * adding the device) calling spi_master_put() and kfree() to prevent a memory + * leak. */ struct spi_master *spi_alloc_master(struct device *dev, unsigned size) {