Commit fa2b5647 authored by Mark Brown's avatar Mark Brown

Merge remote-tracking branch 'spi/topic/core' into spi-next

parents 8331c49c 840e9c35
...@@ -345,14 +345,12 @@ static DEFINE_MUTEX(board_lock); ...@@ -345,14 +345,12 @@ static DEFINE_MUTEX(board_lock);
struct spi_device *spi_alloc_device(struct spi_master *master) struct spi_device *spi_alloc_device(struct spi_master *master)
{ {
struct spi_device *spi; struct spi_device *spi;
struct device *dev = master->dev.parent;
if (!spi_master_get(master)) if (!spi_master_get(master))
return NULL; return NULL;
spi = kzalloc(sizeof(*spi), GFP_KERNEL); spi = kzalloc(sizeof(*spi), GFP_KERNEL);
if (!spi) { if (!spi) {
dev_err(dev, "cannot alloc spi_device\n");
spi_master_put(master); spi_master_put(master);
return NULL; return NULL;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment