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

This commit is contained in:
Mark Brown 2014-12-08 12:17:11 +00:00
commit 19a0368028
2 changed files with 7 additions and 1 deletions

View file

@ -1001,7 +1001,7 @@ static int spi_init_queue(struct spi_master *master)
dev_name(&master->dev));
if (IS_ERR(master->kworker_task)) {
dev_err(&master->dev, "failed to create message pump task\n");
return -ENOMEM;
return PTR_ERR(master->kworker_task);
}
init_kthread_work(&master->pump_messages, spi_pump_messages);