From e64cfd6b0d33495184673511443f78fa08e47752 Mon Sep 17 00:00:00 2001 From: Manu Abraham Date: Fri, 4 Dec 2009 04:40:16 -0300 Subject: [PATCH] --- yaml --- r: 179459 b: refs/heads/master c: 99d96e4e9202aa046e3e2be1813ff59c84e67608 h: refs/heads/master i: 179457: 22512160874bdb5691d37210ac928b33786959f4 179455: 26c72112bf8345d9116cca2ae064299e6f039d96 v: v3 --- [refs] | 2 +- trunk/drivers/media/dvb/mantis/mantis_i2c.c | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 0de8ee5c8857..2c15dae0aef6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 51d20db8bb9c5a14ac2320664289f13bd52625c6 +refs/heads/master: 99d96e4e9202aa046e3e2be1813ff59c84e67608 diff --git a/trunk/drivers/media/dvb/mantis/mantis_i2c.c b/trunk/drivers/media/dvb/mantis/mantis_i2c.c index 005df1e90a16..45d9e6bd9628 100644 --- a/trunk/drivers/media/dvb/mantis/mantis_i2c.c +++ b/trunk/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)