diff options
| author | Luis Claudio R. Goncalves <lgoncalv@redhat.com> | 2021-07-05 22:19:19 -0300 |
|---|---|---|
| committer | Luis Claudio R. Goncalves <lgoncalv@redhat.com> | 2021-07-05 22:19:19 -0300 |
| commit | d9b4708e13982ae6d8b3d73e16bf4321ae13aa40 (patch) | |
| tree | 73cd1b0bb2e54e410a49ac687963be4f86d4fd2e /drivers/i2c | |
| parent | 1506923e9638898fa01689f11606e44b77f2c3ce (diff) | |
| parent | 313e82bbefb3d1d926858b58092f5d50f41d924d (diff) | |
| download | linux-rt-d9b4708e13982ae6d8b3d73e16bf4321ae13aa40.tar.gz | |
Merge tag 'v4.14.238' into v4.14-rt
Conflicts:
drivers/target/target_core_transport.c
Signed-off-by: Luis Claudio R. Goncalves <lgoncalv@redhat.com>
Diffstat (limited to 'drivers/i2c')
| -rw-r--r-- | drivers/i2c/busses/i2c-robotfuzz-osif.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/i2c/busses/i2c-robotfuzz-osif.c b/drivers/i2c/busses/i2c-robotfuzz-osif.c index 9c0f52b7ff7e..b9b4758c6be7 100644 --- a/drivers/i2c/busses/i2c-robotfuzz-osif.c +++ b/drivers/i2c/busses/i2c-robotfuzz-osif.c @@ -89,7 +89,7 @@ static int osif_xfer(struct i2c_adapter *adapter, struct i2c_msg *msgs, } } - ret = osif_usb_read(adapter, OSIFI2C_STOP, 0, 0, NULL, 0); + ret = osif_usb_write(adapter, OSIFI2C_STOP, 0, 0, NULL, 0); if (ret) { dev_err(&adapter->dev, "failure sending STOP\n"); return -EREMOTEIO; @@ -159,7 +159,7 @@ static int osif_probe(struct usb_interface *interface, * Set bus frequency. The frequency is: * 120,000,000 / ( 16 + 2 * div * 4^prescale). * Using dev = 52, prescale = 0 give 100KHz */ - ret = osif_usb_read(&priv->adapter, OSIFI2C_SET_BIT_RATE, 52, 0, + ret = osif_usb_write(&priv->adapter, OSIFI2C_SET_BIT_RATE, 52, 0, NULL, 0); if (ret) { dev_err(&interface->dev, "failure sending bit rate"); |