Commit 9ce5db27 authored by Mark Brown's avatar Mark Brown

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

parents 9f9499ae 157f38f9
...@@ -1705,7 +1705,7 @@ struct spi_master *spi_alloc_master(struct device *dev, unsigned size) ...@@ -1705,7 +1705,7 @@ struct spi_master *spi_alloc_master(struct device *dev, unsigned size)
master->bus_num = -1; master->bus_num = -1;
master->num_chipselect = 1; master->num_chipselect = 1;
master->dev.class = &spi_master_class; master->dev.class = &spi_master_class;
master->dev.parent = get_device(dev); master->dev.parent = dev;
spi_master_set_devdata(master, &master[1]); spi_master_set_devdata(master, &master[1]);
return master; return master;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment