git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
IB/core: Use GRH when the path hop-limit > 0
[pandora-kernel.git]
/
drivers
/
spi
/
spi.c
diff --git
a/drivers/spi/spi.c
b/drivers/spi/spi.c
index
4d1b9f5
..
f978051
100644
(file)
--- a/
drivers/spi/spi.c
+++ b/
drivers/spi/spi.c
@@
-29,6
+29,7
@@
#include <linux/spi/spi.h>
#include <linux/of_spi.h>
#include <linux/pm_runtime.h>
#include <linux/spi/spi.h>
#include <linux/of_spi.h>
#include <linux/pm_runtime.h>
+#include <linux/export.h>
static void spidev_release(struct device *dev)
{
static void spidev_release(struct device *dev)
{
@@
-318,7
+319,7
@@
struct spi_device *spi_alloc_device(struct spi_master *master)
}
spi->master = master;
}
spi->master = master;
- spi->dev.parent = dev;
+ spi->dev.parent =
&master->
dev;
spi->dev.bus = &spi_bus_type;
spi->dev.release = spidev_release;
device_initialize(&spi->dev);
spi->dev.bus = &spi_bus_type;
spi->dev.release = spidev_release;
device_initialize(&spi->dev);
@@
-553,7
+554,7
@@
struct spi_master *spi_alloc_master(struct device *dev, unsigned size)
device_initialize(&master->dev);
master->dev.class = &spi_master_class;
device_initialize(&master->dev);
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;
spi_master_set_devdata(master, &master[1]);
return master;