diff options
| author | Linus Torvalds | 2020-06-27 15:15:37 -0700 |
|---|---|---|
| committer | Linus Torvalds | 2020-06-27 15:15:37 -0700 |
| commit | 8bf9865187f6c3130b5c748a3212d591c9d563de (patch) | |
| tree | 6f3cd2a376292c28ca367c7c146d8432c945ff30 /drivers/i2c/busses/i2c-designware-platdrv.c | |
| parent | 42afe7d1c6ef77212250af3459e549d1a944cc8a (diff) | |
| parent | 40e05200593af06633f64ab0effff052eee6f076 (diff) | |
Merge branch 'i2c/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux
Pull i2c fixes from Wolfram Sang:
"This contains a 5.8 regression fix for the Designware driver, a
register bitfield fix for the fsi driver, and a missing sanity check
for the I2C core"
* 'i2c/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux:
i2c: core: check returned size of emulated smbus block read
i2c: fsi: Fix the port number field in status register
i2c: designware: Adjust bus speed independently of ACPI
Diffstat (limited to 'drivers/i2c/busses/i2c-designware-platdrv.c')
| -rw-r--r-- | drivers/i2c/busses/i2c-designware-platdrv.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/i2c/busses/i2c-designware-platdrv.c b/drivers/i2c/busses/i2c-designware-platdrv.c index 0de4e302fc6a..c2efaaaac252 100644 --- a/drivers/i2c/busses/i2c-designware-platdrv.c +++ b/drivers/i2c/busses/i2c-designware-platdrv.c @@ -228,7 +228,7 @@ static int dw_i2c_plat_probe(struct platform_device *pdev) else i2c_parse_fw_timings(&pdev->dev, t, false); - i2c_dw_acpi_adjust_bus_speed(&pdev->dev); + i2c_dw_adjust_bus_speed(dev); if (pdev->dev.of_node) dw_i2c_of_configure(pdev); |