diff options
| author | Mark Brown | 2014-12-08 13:17:11 +0100 |
|---|---|---|
| committer | Mark Brown | 2014-12-08 13:17:11 +0100 |
| commit | 19a0368028de2575ed562600888d856196ebfc05 (patch) | |
| tree | 7721735ae4e7487234be1987da07af3c1d7fe2ee /drivers/spi/spi.c | |
| parent | Merge remote-tracking branch 'spi/fix/cadence' into spi-linus (diff) | |
| parent | spi: core: Do not mangle error code from kthread_run() (diff) | |
| download | kernel-qcow2-linux-19a0368028de2575ed562600888d856196ebfc05.tar.gz kernel-qcow2-linux-19a0368028de2575ed562600888d856196ebfc05.tar.xz kernel-qcow2-linux-19a0368028de2575ed562600888d856196ebfc05.zip | |
Merge remote-tracking branch 'spi/topic/core' into spi-next
Diffstat (limited to 'drivers/spi/spi.c')
| -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 50f20f243981..da7e6225b8f6 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); |