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

git-mirror · Dec 16, 2015 · 9ce5db2 · 9ce5db2
2 parents 9f9499a + 157f38f
commit 9ce5db2
Showing 1 changed file with 1 addition and 1 deletion.
diff --git 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;