Code Review
/
kvmfornfv.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Kernel bump from 4.1.3-rt to 4.1.7-rt.
[kvmfornfv.git]
/
kernel
/
drivers
/
i2c
/
muxes
/
i2c-mux-pca9541.c
diff --git
a/kernel/drivers/i2c/muxes/i2c-mux-pca9541.c
b/kernel/drivers/i2c/muxes/i2c-mux-pca9541.c
index
cb77277
..
0c8d4d2
100644
(file)
--- a/
kernel/drivers/i2c/muxes/i2c-mux-pca9541.c
+++ b/
kernel/drivers/i2c/muxes/i2c-mux-pca9541.c
@@
-104,7
+104,7
@@
static int pca9541_reg_write(struct i2c_client *client, u8 command, u8 val)
buf[0] = command;
buf[1] = val;
msg.buf = buf;
buf[0] = command;
buf[1] = val;
msg.buf = buf;
- ret =
adap->algo->master_x
fer(adap, &msg, 1);
+ ret =
__i2c_trans
fer(adap, &msg, 1);
} else {
union i2c_smbus_data data;
} else {
union i2c_smbus_data data;
@@
-144,7
+144,7
@@
static int pca9541_reg_read(struct i2c_client *client, u8 command)
.buf = &val
}
};
.buf = &val
}
};
- ret =
adap->algo->master_x
fer(adap, msg, 2);
+ ret =
__i2c_trans
fer(adap, msg, 2);
if (ret == 2)
ret = val;
else if (ret >= 0)
if (ret == 2)
ret = val;
else if (ret >= 0)