diff options
| author | Mark Brown <broonie@kernel.org> | 2014-12-08 12:17:11 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2014-12-08 12:17:11 +0000 |
| commit | 19a0368028de2575ed562600888d856196ebfc05 (patch) | |
| tree | 7721735ae4e7487234be1987da07af3c1d7fe2ee /drivers/spi | |
| parent | c9508d4b3a0a37157fd2fbbac8caa56d7399600b (diff) | |
| parent | 98a8f5a0538fe1a02a6a73a3451f1c093e30bdfc (diff) | |
Merge remote-tracking branch 'spi/topic/core' into spi-next
Diffstat (limited to 'drivers/spi')
| -rw-r--r-- | drivers/spi/spi.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c index 50f20f24398..da7e6225b8f 100644 --- a/drivers/spi/spi.c +++ b/drivers/spi/spi.c @@ -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); |