From 14c03a4f175df36413308a565eb3b522656b0a19 Mon Sep 17 00:00:00 2001 From: Julia Lawall Date: Tue, 10 Aug 2010 18:02:03 -0700 Subject: [PATCH] --- yaml --- r: 208449 b: refs/heads/master c: 32fa45498f843fcf56087b8046d8319fcd455ef0 h: refs/heads/master i: 208447: f9b09b53d7bdcc29c1dc9fe42ba3eaf869baabdf v: v3 --- [refs] | 2 +- trunk/drivers/message/i2o/exec-osm.c | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index a83c5dcf40d7..317bf12d3e62 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 568133ebda39f7507759a744fa9cf4d5097bad2f +refs/heads/master: 32fa45498f843fcf56087b8046d8319fcd455ef0 diff --git a/trunk/drivers/message/i2o/exec-osm.c b/trunk/drivers/message/i2o/exec-osm.c index 06c655c55587..a3970e56ae53 100644 --- a/trunk/drivers/message/i2o/exec-osm.c +++ b/trunk/drivers/message/i2o/exec-osm.c @@ -389,12 +389,16 @@ static int i2o_exec_lct_notify(struct i2o_controller *c, u32 change_ind) dev = &c->pdev->dev; if (i2o_dma_realloc(dev, &c->dlct, - le32_to_cpu(sb->expected_lct_size))) + le32_to_cpu(sb->expected_lct_size))) { + mutex_unlock(&c->lct_lock); return -ENOMEM; + } msg = i2o_msg_get_wait(c, I2O_TIMEOUT_MESSAGE_GET); - if (IS_ERR(msg)) + if (IS_ERR(msg)) { + mutex_unlock(&c->lct_lock); return PTR_ERR(msg); + } msg->u.head[0] = cpu_to_le32(EIGHT_WORD_MSG_SIZE | SGL_OFFSET_6); msg->u.head[1] = cpu_to_le32(I2O_CMD_LCT_NOTIFY << 24 | HOST_TID << 12 |