From 9f0d9ee923b2335f2730fb69df8c75f0f713a42a Mon Sep 17 00:00:00 2001 From: Rabin Vincent Date: Thu, 8 Mar 2012 14:01:46 +0100 Subject: [PATCH] --- yaml --- r: 296873 b: refs/heads/master c: 392cbd1e608ba79bd2da652eb3a28d841e51eaee h: refs/heads/master i: 296871: 4244c702649789d3f57cde96a0e65786ca6da053 v: v3 --- [refs] | 2 +- trunk/drivers/mfd/ab8500-core.c | 12 +++--------- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/[refs] b/[refs] index db9c8777e454..c14b9fb9c6d8 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: bd155d2c3c8b04d66f7890dbd9539c37e9dea02b +refs/heads/master: 392cbd1e608ba79bd2da652eb3a28d841e51eaee diff --git a/trunk/drivers/mfd/ab8500-core.c b/trunk/drivers/mfd/ab8500-core.c index 15a18fee9713..f134a6cd4b8a 100644 --- a/trunk/drivers/mfd/ab8500-core.c +++ b/trunk/drivers/mfd/ab8500-core.c @@ -147,9 +147,7 @@ static int set_register_interruptible(struct ab8500 *ab8500, u8 bank, dev_vdbg(ab8500->dev, "wr: addr %#x <= %#x\n", addr, data); - ret = mutex_lock_interruptible(&ab8500->lock); - if (ret) - return ret; + mutex_lock(&ab8500->lock); ret = ab8500->write(ab8500, addr, data); if (ret < 0) @@ -176,9 +174,7 @@ static int get_register_interruptible(struct ab8500 *ab8500, u8 bank, * bank on higher 8 bits and reg in lower */ u16 addr = ((u16)bank) << 8 | reg; - ret = mutex_lock_interruptible(&ab8500->lock); - if (ret) - return ret; + mutex_lock(&ab8500->lock); ret = ab8500->read(ab8500, addr); if (ret < 0) @@ -210,9 +206,7 @@ static int mask_and_set_register_interruptible(struct ab8500 *ab8500, u8 bank, * bank on higher 8 bits and reg in lower */ u16 addr = ((u16)bank) << 8 | reg; - ret = mutex_lock_interruptible(&ab8500->lock); - if (ret) - return ret; + mutex_lock(&ab8500->lock); ret = ab8500->read(ab8500, addr); if (ret < 0) {