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

This commit is contained in:
Mark Brown 2015-12-16 13:28:31 +00:00
commit 9ce5db27f4

View File

@ -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;