From a666c0b668c897192655e3ef67054b9f68f2813b Mon Sep 17 00:00:00 2001
From: Jonathan Cameron <jic23@cam.ac.uk>
Date: Sat, 9 Jan 2010 16:57:34 +0000
Subject: [PATCH] --- yaml --- r: 186639 b: refs/heads/master c:
 75c8075394906b4bda4b056328bd9b401277d9b8 h: refs/heads/master i:   186637:
 2e1c70a6a0cc2a3c269cc53975c12a7a9a55e415   186635:
 5e0240b92442d2b54217ae7910b913f1e02a8c98   186631:
 6c6f7bb7027ca5e8f313d598319547ba66651a9a   186623:
 664026ccf178f7f7a1d13eea4a2f11e3d25e066d v: v3

---
 [refs]                                        | 2 +-
 trunk/drivers/staging/iio/industrialio-core.c | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index b40ceb234633..8dba4cb6f2d1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0daa04a586f03de8f9022e29fb41c9dc0de28c4a
+refs/heads/master: 75c8075394906b4bda4b056328bd9b401277d9b8
diff --git a/trunk/drivers/staging/iio/industrialio-core.c b/trunk/drivers/staging/iio/industrialio-core.c
index 768f44894d08..87799b2a9262 100644
--- a/trunk/drivers/staging/iio/industrialio-core.c
+++ b/trunk/drivers/staging/iio/industrialio-core.c
@@ -79,11 +79,14 @@ EXPORT_SYMBOL(__iio_change_event);
 	/* Does anyone care? */
 	mutex_lock(&ev_int->event_list_lock);
 	if (test_bit(IIO_BUSY_BIT_POS, &ev_int->handler.flags)) {
-		if (ev_int->current_events == ev_int->max_events)
+		if (ev_int->current_events == ev_int->max_events) {
+			mutex_unlock(&ev_int->event_list_lock);
 			return 0;
+		}
 		ev = kmalloc(sizeof(*ev), GFP_KERNEL);
 		if (ev == NULL) {
 			ret = -ENOMEM;
+			mutex_unlock(&ev_int->event_list_lock);
 			goto error_ret;
 		}
 		ev->ev.id = ev_code;