diff options
| author |   Mark Brown <broonie@linaro.org> | 2014-08-04 17:21:03 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2014-08-04 17:21:03 +0100 |
| commit | fa2b5647cf733d99df176ae4dd3c1d31d5e50701 (patch) | |
| tree | 06a843e4e69d5a2cb77b8a1a013b118211578a03 /drivers/spi/spi.c | |
| parent | Merge remote-tracking branches 'spi/fix/s3c64xx', 'spi/fix/samsung' and 'spi/fix/xilinx' into spi-linus (diff) | |
| parent | spi: Remove unused variable (diff) | |
| download | linux-dev-fa2b5647cf733d99df176ae4dd3c1d31d5e50701.tar.xz linux-dev-fa2b5647cf733d99df176ae4dd3c1d31d5e50701.zip | |
Merge remote-tracking branch 'spi/topic/core' into spi-next
Diffstat (limited to 'drivers/spi/spi.c')
| -rw-r--r-- | drivers/spi/spi.c | 2 |
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; } |