X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=drivers%2Fspi%2Fspi.c;h=f978051ce8f57481b5f34709d7d1207039f1cdd0;hb=a1663179bb1707a285258870914536a64cc1c90a;hp=77eae99af11ce7ee1541816f3e8c99b352b7a241;hpb=98393b8ff2ca98b5b984e73a291b81b326e25184;p=pandora-kernel.git

diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c
index 77eae99af11c..f978051ce8f5 100644
--- a/drivers/spi/spi.c
+++ b/drivers/spi/spi.c
@@ -319,7 +319,7 @@ struct spi_device *spi_alloc_device(struct spi_master *master)
 	}
 
 	spi->master = master;
-	spi->dev.parent = dev;
+	spi->dev.parent = &master->dev;
 	spi->dev.bus = &spi_bus_type;
 	spi->dev.release = spidev_release;
 	device_initialize(&spi->dev);
@@ -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;