diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-10-30 09:15:31 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-10-30 09:15:31 -0700 |
| commit | c2101d01826480755f2bd9f3dd5e36757be61e23 (patch) | |
| tree | 3f1d29969a98cc78b84335dc185e2806cd025282 /drivers/i2c/busses/i2c-designware-common.c | |
| parent | 6ef746769ef5cfef84cdfdf61ecbab5a6aa4651a (diff) | |
| parent | 6a9b593d4b6f5994209456de7a3c2db0974b5dda (diff) | |
| download | linux-c2101d01826480755f2bd9f3dd5e36757be61e23.tar.bz2 | |
Merge tag 'acpi-4.20-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
Pull more ACPI updates from Rafael Wysocki:
"Rework the handling of the P-unit semaphore on Intel Baytrail and
Cherrytrail systems to avoid race conditions and excessive overhead
related to it (Hans de Goede)"
* tag 'acpi-4.20-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
ACPI / PMIC: xpower: Add depends on IOSF_MBI to Kconfig entry
i2c: designware: Cleanup bus lock handling
ACPI / PMIC: xpower: Block P-Unit I2C access during read-modify-write
x86: baytrail/cherrytrail: Rework and move P-Unit PMIC bus semaphore code
Diffstat (limited to 'drivers/i2c/busses/i2c-designware-common.c')
| -rw-r--r-- | drivers/i2c/busses/i2c-designware-common.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/i2c/busses/i2c-designware-common.c b/drivers/i2c/busses/i2c-designware-common.c index 36271cd75342..a4730111d290 100644 --- a/drivers/i2c/busses/i2c-designware-common.c +++ b/drivers/i2c/busses/i2c-designware-common.c @@ -269,7 +269,7 @@ int i2c_dw_acquire_lock(struct dw_i2c_dev *dev) if (!dev->acquire_lock) return 0; - ret = dev->acquire_lock(dev); + ret = dev->acquire_lock(); if (!ret) return 0; @@ -281,7 +281,7 @@ int i2c_dw_acquire_lock(struct dw_i2c_dev *dev) void i2c_dw_release_lock(struct dw_i2c_dev *dev) { if (dev->release_lock) - dev->release_lock(dev); + dev->release_lock(); } /* |