aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2015-12-16 08:28:31 -0500
committerMark Brown <broonie@kernel.org>2015-12-16 08:28:31 -0500
commit9ce5db27f4a959ca58d768c5c8e5c98a47361e67 (patch)
treed97b06574003c70229040268655f1daa78c540ad
parent9f9499ae8e6415cefc4fe0a96ad0e27864353c89 (diff)
parent157f38f993919b648187ba341bfb05d0e91ad2f6 (diff)
Merge remote-tracking branch 'spi/fix/core' into spi-linus
-rw-r--r--drivers/spi/spi.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c
index 2b0a8ec3affb..dee1cb87d24f 100644
--- 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)
1705 master->bus_num = -1; 1705 master->bus_num = -1;
1706 master->num_chipselect = 1; 1706 master->num_chipselect = 1;
1707 master->dev.class = &spi_master_class; 1707 master->dev.class = &spi_master_class;
1708 master->dev.parent = get_device(dev); 1708 master->dev.parent = dev;
1709 spi_master_set_devdata(master, &master[1]); 1709 spi_master_set_devdata(master, &master[1]);
1710 1710
1711 return master; 1711 return master;