diff options
author | Johan Hovold <johan@kernel.org> | 2015-12-14 10:16:19 -0500 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2015-12-16 07:28:25 -0500 |
commit | 157f38f993919b648187ba341bfb05d0e91ad2f6 (patch) | |
tree | b61ab5a98ff25cf32ea8fa5326e2331e12245b76 | |
parent | 8005c49d9aea74d382f474ce11afbbc7d7130bec (diff) |
spi: fix parent-device reference leak
Fix parent-device reference leak due to SPI-core taking an unnecessary
reference to the parent when allocating the master structure, a
reference that was never released.
Note that driver core takes its own reference to the parent when the
master device is registered.
Fixes: 49dce689ad4e ("spi doesn't need class_device")
Signed-off-by: Johan Hovold <johan@kernel.org>
Signed-off-by: Mark Brown <broonie@kernel.org>
Cc: stable@vger.kernel.org
-rw-r--r-- | drivers/spi/spi.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c index e2415be209d5..7bf25274ad78 100644 --- a/drivers/spi/spi.c +++ b/drivers/spi/spi.c | |||
@@ -1704,7 +1704,7 @@ struct spi_master *spi_alloc_master(struct device *dev, unsigned size) | |||
1704 | master->bus_num = -1; | 1704 | master->bus_num = -1; |
1705 | master->num_chipselect = 1; | 1705 | master->num_chipselect = 1; |
1706 | master->dev.class = &spi_master_class; | 1706 | master->dev.class = &spi_master_class; |
1707 | master->dev.parent = get_device(dev); | 1707 | master->dev.parent = dev; |
1708 | spi_master_set_devdata(master, &master[1]); | 1708 | spi_master_set_devdata(master, &master[1]); |
1709 | 1709 | ||
1710 | return master; | 1710 | return master; |