Merge remote-tracking branch 'spi/fix/core' into spi-linus

9ce5db27 · Mark Brown · 9f9499ae · 157f38f9 · 9ce5db27
Commit 9ce5db27 authored Dec 16, 2015 by Mark Brown
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

drivers/spi/spi.c drivers/spi/spi.c +1 -1

No files found.
--- a/drivers/spi/spi.c
+++ b/drivers/spi/spi.c
@@ -1705,7 +1705,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;