diff options
| author | Wolfram Sang <wsa@kernel.org> | 2021-10-11 09:15:48 +0300 |
|---|---|---|
| committer | Wolfram Sang <wsa@kernel.org> | 2021-10-11 09:15:48 +0300 |
| commit | c5c34f5793f384ed2895584c6e2350b059c3f161 (patch) | |
| tree | 14a73568207fb3d38d7aa43439493ac8bc906bde /drivers/i2c/busses/i2c-mlxcpld.c | |
| parent | 669b2e4aa1a869def4dc207ea084fdd77366d646 (diff) | |
| parent | 64570fbc14f8d7cb3fe3995f20e26bc25ce4b2cc (diff) | |
| download | linux-c5c34f5793f384ed2895584c6e2350b059c3f161.tar.xz | |
Merge branch 'i2c/for-current' into i2c/for-mergewindow
Diffstat (limited to 'drivers/i2c/busses/i2c-mlxcpld.c')
| -rw-r--r-- | drivers/i2c/busses/i2c-mlxcpld.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/i2c/busses/i2c-mlxcpld.c b/drivers/i2c/busses/i2c-mlxcpld.c index 520db32ad467..615f0a98640e 100644 --- a/drivers/i2c/busses/i2c-mlxcpld.c +++ b/drivers/i2c/busses/i2c-mlxcpld.c @@ -49,7 +49,7 @@ #define MLXCPLD_LPCI2C_NACK_IND 2 #define MLXCPLD_I2C_FREQ_1000KHZ_SET 0x04 -#define MLXCPLD_I2C_FREQ_400KHZ_SET 0x0f +#define MLXCPLD_I2C_FREQ_400KHZ_SET 0x0c #define MLXCPLD_I2C_FREQ_100KHZ_SET 0x42 enum mlxcpld_i2c_frequency { @@ -495,7 +495,7 @@ mlxcpld_i2c_set_frequency(struct mlxcpld_i2c_priv *priv, return err; /* Set frequency only if it is not 100KHz, which is default. */ - switch ((data->reg & data->mask) >> data->bit) { + switch ((regval & data->mask) >> data->bit) { case MLXCPLD_I2C_FREQ_1000KHZ: freq = MLXCPLD_I2C_FREQ_1000KHZ_SET; break; |