浏览代码

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

Mark Brown 11 年之前
父节点
当前提交
fa2b5647cf
共有 1 个文件被更改,包括 0 次插入2 次删除
  1. 0 2
      drivers/spi/spi.c

+ 0 - 2
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;
 	}