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

git-mirror · Aug 4, 2014 · fa2b564 · fa2b564
2 parents 8331c49 + 840e9c3
commit fa2b564
Showing 1 changed file with 0 additions and 2 deletions.
diff --git 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;
 	}