diff options
author | Mark Brown <broonie@linaro.org> | 2014-08-04 12:21:03 -0400 |
---|---|---|
committer | Mark Brown <broonie@linaro.org> | 2014-08-04 12:21:03 -0400 |
commit | fa2b5647cf733d99df176ae4dd3c1d31d5e50701 (patch) | |
tree | 06a843e4e69d5a2cb77b8a1a013b118211578a03 | |
parent | 8331c49c48af37f435aa9d9daa3b2ce38db64856 (diff) | |
parent | 840e9c354f3492259a65ae235351cde1089a409e (diff) |
Merge remote-tracking branch 'spi/topic/core' into spi-next
-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); | |||
345 | struct spi_device *spi_alloc_device(struct spi_master *master) | 345 | struct spi_device *spi_alloc_device(struct spi_master *master) |
346 | { | 346 | { |
347 | struct spi_device *spi; | 347 | struct spi_device *spi; |
348 | struct device *dev = master->dev.parent; | ||
349 | 348 | ||
350 | if (!spi_master_get(master)) | 349 | if (!spi_master_get(master)) |
351 | return NULL; | 350 | return NULL; |
352 | 351 | ||
353 | spi = kzalloc(sizeof(*spi), GFP_KERNEL); | 352 | spi = kzalloc(sizeof(*spi), GFP_KERNEL); |
354 | if (!spi) { | 353 | if (!spi) { |
355 | dev_err(dev, "cannot alloc spi_device\n"); | ||
356 | spi_master_put(master); | 354 | spi_master_put(master); |
357 | return NULL; | 355 | return NULL; |
358 | } | 356 | } |