summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorJohan Hovold <johan@kernel.org>2015-12-14 16:16:19 +0100
committerMark Brown <broonie@kernel.org>2015-12-16 12:28:25 +0000
commit157f38f993919b648187ba341bfb05d0e91ad2f6 (patch)
treeb61ab5a98ff25cf32ea8fa5326e2331e12245b76 /drivers
parent8005c49d9aea74d382f474ce11afbbc7d7130bec (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
Diffstat (limited to 'drivers')
-rw-r--r--drivers/spi/spi.c2
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)
master->bus_num = -1;
master->num_chipselect = 1;
master->dev.class = &spi_master_class;
- master->dev.parent = get_device(dev);
+ master->dev.parent = dev;
spi_master_set_devdata(master, &master[1]);
return master;