]> git.hungrycats.org Git - linux/commitdiff
spi: fix parent-device reference leak
authorJohan Hovold <johan@kernel.org>
Mon, 14 Dec 2015 15:16:19 +0000 (16:16 +0100)
committerBen Hutchings <ben@decadent.org.uk>
Fri, 22 Jan 2016 21:40:05 +0000 (21:40 +0000)
commit 157f38f993919b648187ba341bfb05d0e91ad2f6 upstream.

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>
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
drivers/spi/spi.c

index b2ccdea30cb92524427cffbad40ddeb5319f5b14..f978051ce8f57481b5f34709d7d1207039f1cdd0 100644 (file)
@@ -554,7 +554,7 @@ struct spi_master *spi_alloc_master(struct device *dev, unsigned size)
 
        device_initialize(&master->dev);
        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;