summaryrefslogtreecommitdiff
path: root/drivers/base/regmap/regmap-spi.c
diff options
context:
space:
mode:
authorMark Brown <broonie@linaro.org>2013-10-28 13:01:32 -0700
committerMark Brown <broonie@linaro.org>2013-10-28 13:01:32 -0700
commit5eff79fe2d239a60c98ec709c769f8e8f952b42f (patch)
tree7bcd2f93edc84b449b3be8af0c8de9e93b9a13b9 /drivers/base/regmap/regmap-spi.c
parent70c1c86d56522fd1dffb9c17df4cbec3c2e1ac60 (diff)
parent04c50ccf0dab02923ef888a4839bfbd00de03181 (diff)
Merge remote-tracking branch 'regmap/topic/async' into regmap-next
Diffstat (limited to 'drivers/base/regmap/regmap-spi.c')
-rw-r--r--drivers/base/regmap/regmap-spi.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/base/regmap/regmap-spi.c b/drivers/base/regmap/regmap-spi.c
index 4c506bd940f3..37f12ae7aada 100644
--- a/drivers/base/regmap/regmap-spi.c
+++ b/drivers/base/regmap/regmap-spi.c
@@ -73,7 +73,8 @@ static int regmap_spi_async_write(void *context,
spi_message_init(&async->m);
spi_message_add_tail(&async->t[0], &async->m);
- spi_message_add_tail(&async->t[1], &async->m);
+ if (val)
+ spi_message_add_tail(&async->t[1], &async->m);
async->m.complete = regmap_spi_complete;
async->m.context = async;