Code Review
/
kvmfornfv.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
These changes are the raw update to linux-4.4.6-rt14. Kernel sources
[kvmfornfv.git]
/
kernel
/
drivers
/
media
/
i2c
/
s5c73m3
/
s5c73m3-core.c
diff --git
a/kernel/drivers/media/i2c/s5c73m3/s5c73m3-core.c
b/kernel/drivers/media/i2c/s5c73m3/s5c73m3-core.c
index
08b234b
..
51b2601
100644
(file)
--- a/
kernel/drivers/media/i2c/s5c73m3/s5c73m3-core.c
+++ b/
kernel/drivers/media/i2c/s5c73m3/s5c73m3-core.c
@@
-167,7
+167,7
@@
static int s5c73m3_i2c_read(struct i2c_client *client, u16 addr, u16 *data)
*/
ret = i2c_transfer(client->adapter, msg, 2);
if (ret == 2) {
*/
ret = i2c_transfer(client->adapter, msg, 2);
if (ret == 2) {
- *data = be16_to_cpup((
u
16 *)rbuf);
+ *data = be16_to_cpup((
__be
16 *)rbuf);
v4l2_dbg(4, s5c73m3_dbg, client,
"%s: addr: 0x%04x, data: 0x%04x\n",
__func__, addr, *data);
v4l2_dbg(4, s5c73m3_dbg, client,
"%s: addr: 0x%04x, data: 0x%04x\n",
__func__, addr, *data);
@@
-1453,7
+1453,7
@@
static int s5c73m3_oif_set_power(struct v4l2_subdev *sd, int on)
state->apply_fiv = 1;
state->apply_fmt = 1;
}
state->apply_fiv = 1;
state->apply_fmt = 1;
}
- } else if (
!on == state->power
) {
+ } else if (
state->power == !on
) {
ret = s5c73m3_set_af_softlanding(state);
if (!ret)
ret = __s5c73m3_power_off(state);
ret = s5c73m3_set_af_softlanding(state);
if (!ret)
ret = __s5c73m3_power_off(state);