diff options
| author | Marcel Ziswiler <marcel.ziswiler@toradex.com> | 2013-10-21 13:09:14 +0200 |
|---|---|---|
| committer | Marcel Ziswiler <marcel.ziswiler@toradex.com> | 2013-10-21 13:09:14 +0200 |
| commit | 52b0e319838282ab46592159131b2891104df528 (patch) | |
| tree | 28eedf41a093a1aca3a634fd90f9394825d5128f /drivers | |
| parent | 5746e7e3d1376c80ae7f512d110adbcbad3e7000 (diff) | |
| parent | 498b5774630e0c8ac7dadd72fce5ceb555f741b8 (diff) | |
Merge branch '3.0-mvf' into colibri_vf
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/i2c/busses/i2c-imx.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/i2c/busses/i2c-imx.c b/drivers/i2c/busses/i2c-imx.c index 36bad1eaa428..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 @@ -620,9 +620,9 @@ static int __init i2c_imx_probe(struct platform_device *pdev) platform_set_drvdata(pdev, i2c_imx); #ifdef CONFIG_ARCH_MVF - // make sure not in use by MQX - if(mvf_sema4_assign(3, true, &sema4)) { - dev_err(&pdev->dev, "could not grab MQX semaphore\n"); + // for makeing sure not in use by MQX concurrently + 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; } #endif |