summaryrefslogtreecommitdiff
path: root/drivers/spi
diff options
context:
space:
mode:
authorMark Brown <broonie@linaro.org>2013-06-26 19:20:58 +0400
committerMark Brown <broonie@linaro.org>2013-06-26 19:20:58 +0400
commit385daaf0a8c1d35d9c07454b3f7a3b4560bfae76 (patch)
treed0d7e2f0b98543d9ac2a0b2dba13c2a789c05d54 /drivers/spi
parent6140b05ca351000dd844f05495198d8425ccf394 (diff)
parent27474d268c20a0e62f71065a043c08f5adb2419d (diff)
downloadlinux-385daaf0a8c1d35d9c07454b3f7a3b4560bfae76.tar.xz
Merge remote-tracking branch 'spi/topic/ep93xx' into spi-next
Diffstat (limited to 'drivers/spi')
-rw-r--r--drivers/spi/spi-ep93xx.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/spi/spi-ep93xx.c b/drivers/spi/spi-ep93xx.c
index 15ea07d8f8d6..cad30b8a1d71 100644
--- a/drivers/spi/spi-ep93xx.c
+++ b/drivers/spi/spi-ep93xx.c
@@ -1095,6 +1095,7 @@ static int ep93xx_spi_probe(struct platform_device *pdev)
espi->wq = create_singlethread_workqueue("ep93xx_spid");
if (!espi->wq) {
dev_err(&pdev->dev, "unable to create workqueue\n");
+ error = -ENOMEM;
goto fail_free_dma;
}
INIT_WORK(&espi->msg_work, ep93xx_spi_work);