summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorEd Nash <enash54@gmail.com>2013-07-29 21:01:35 -0400
committerEd Nash <enash54@gmail.com>2013-07-29 21:01:35 -0400
commit614660a165ac827ea272c6fa0c59986881309f90 (patch)
treeb745d05e167c8791a4564413c839de00048c3151 /drivers
parent08757351fb4e55f6b8ed0f1a6e9b11329c6daedb (diff)
add support for spin locks
Diffstat (limited to 'drivers')
-rw-r--r--drivers/i2c/busses/i2c-imx.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/i2c/busses/i2c-imx.c b/drivers/i2c/busses/i2c-imx.c
index a2e6d2aa16b3..e13e020cab2e 100644
--- a/drivers/i2c/busses/i2c-imx.c
+++ b/drivers/i2c/busses/i2c-imx.c
@@ -439,7 +439,7 @@ static int i2c_imx_xfer(struct i2c_adapter *adapter,
dev_dbg(&i2c_imx->adapter.dev, "<%s>\n", __func__);
#ifdef CONFIG_ARCH_MVF
- result = mvf_sema4_lock(sema4, 10000000);
+ result = mvf_sema4_lock(sema4, 10000000, true);
if(result)
return result;
#endif
@@ -621,7 +621,7 @@ static int __init i2c_imx_probe(struct platform_device *pdev)
#ifdef CONFIG_ARCH_MVF
// for makeing sure not in use by MQX concurrently
- if(mvf_sema4_assign(MVF_I2C_SEMAPHORE_NUMBER, true, &sema4)) {
+ if(mvf_sema4_assign(MVF_I2C_SEMAPHORE_NUMBER, &sema4)) {
dev_err(&pdev->dev, "could not assign MQX semaphore %d\n", MVF_I2C_SEMAPHORE_NUMBER);
goto fail5;
}