From: Manu Abraham <abraham.manu@gmail.com>
Date: Fri, 4 Dec 2009 07:40:16 +0000 (-0300)
Subject: V4L/DVB (13721): [Mantis] Bug! Before bailing out, Unlock
X-Git-Tag: v6.6-pxa1908~36190^2~94
X-Git-Url: https://git.dujemihanovic.xyz/?a=commitdiff_plain;h=99d96e4e9202aa046e3e2be1813ff59c84e67608;p=linux.git

V4L/DVB (13721): [Mantis] Bug! Before bailing out, Unlock

Thanks to hotwings <user.vdr@gmail.com> for pointing out the bug

Signed-off-by: Manu Abraham <manu@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
---

diff --git a/drivers/media/dvb/mantis/mantis_i2c.c b/drivers/media/dvb/mantis/mantis_i2c.c
index 005df1e90a16..45d9e6bd9628 100644
--- a/drivers/media/dvb/mantis/mantis_i2c.c
+++ b/drivers/media/dvb/mantis/mantis_i2c.c
@@ -133,11 +133,15 @@ static int mantis_i2c_xfer(struct i2c_adapter *adapter, struct i2c_msg *msgs, in
 			ret = mantis_i2c_write(mantis, &msgs[i]);
 
 		if (ret < 0)
-			return ret;
+			goto bail_out;
 	}
 	mutex_unlock(&mantis->i2c_lock);
 
 	return num;
+
+bail_out:
+	mutex_unlock(&mantis->i2c_lock);
+	return ret;
 }
 
 static u32 mantis_i2c_func(struct i2c_adapter *adapter)