From 579d42a80d028670340abf77b97e1960131f8f6b Mon Sep 17 00:00:00 2001 From: Marc Dietrich Date: Sun, 19 Aug 2012 19:03:07 +0200 Subject: [PATCH] --- yaml --- r: 324720 b: refs/heads/master c: 4b8bf03d7f775271c2016e76011b113bc5f83c14 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/staging/nvec/nvec.c | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 13696c99bbb8..c378fd341503 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4344379f63d3bf16d4f2cb3d6b3f3be12704173f +refs/heads/master: 4b8bf03d7f775271c2016e76011b113bc5f83c14 diff --git a/trunk/drivers/staging/nvec/nvec.c b/trunk/drivers/staging/nvec/nvec.c index 3e090ecc2eac..fd84f8fd9533 100644 --- a/trunk/drivers/staging/nvec/nvec.c +++ b/trunk/drivers/staging/nvec/nvec.c @@ -294,8 +294,10 @@ struct nvec_msg *nvec_write_sync(struct nvec_chip *nvec, nvec->sync_write_pending = (data[1] << 8) + data[0]; - if (nvec_write_async(nvec, data, size) < 0) + if (nvec_write_async(nvec, data, size) < 0) { + mutex_unlock(&nvec->sync_write_mutex); return NULL; + } dev_dbg(nvec->dev, "nvec_sync_write: 0x%04x\n", nvec->sync_write_pending);