summaryrefslogtreecommitdiff
path: root/drivers/spi
diff options
context:
space:
mode:
authorMark Brown <broonie@linaro.org>2014-08-04 20:21:03 +0400
committerMark Brown <broonie@linaro.org>2014-08-04 20:21:03 +0400
commitfa2b5647cf733d99df176ae4dd3c1d31d5e50701 (patch)
tree06a843e4e69d5a2cb77b8a1a013b118211578a03 /drivers/spi
parent8331c49c48af37f435aa9d9daa3b2ce38db64856 (diff)
parent840e9c354f3492259a65ae235351cde1089a409e (diff)
downloadlinux-fa2b5647cf733d99df176ae4dd3c1d31d5e50701.tar.xz
Merge remote-tracking branch 'spi/topic/core' into spi-next
Diffstat (limited to 'drivers/spi')
-rw-r--r--drivers/spi/spi.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c
index e691e281e3a2..e6f076d5ffd5 100644
--- a/drivers/spi/spi.c
+++ b/drivers/spi/spi.c
@@ -345,14 +345,12 @@ static DEFINE_MUTEX(board_lock);
struct spi_device *spi_alloc_device(struct spi_master *master)
{
struct spi_device *spi;
- struct device *dev = master->dev.parent;
if (!spi_master_get(master))
return NULL;
spi = kzalloc(sizeof(*spi), GFP_KERNEL);
if (!spi) {
- dev_err(dev, "cannot alloc spi_device\n");
spi_master_put(master);
return NULL;
}