summaryrefslogtreecommitdiffstats
path: root/drivers/media/i2c/adv748x/adv748x-afe.c
diff options
context:
space:
mode:
authorJiri Kosina <jkosina@suse.cz>2018-06-08 10:20:42 +0200
committerJiri Kosina <jkosina@suse.cz>2018-06-08 10:20:42 +0200
commitc1144d29f405ce1f4e6ede6482beb3d0d09750c6 (patch)
tree0f9fe36a50005bae6ffe28a4f978e71273f5b1d1 /drivers/media/i2c/adv748x/adv748x-afe.c
parentHID: core: fix hid_hw_open() comment (diff)
parentHID: alps: Fix some style in 't4_read_write_register()' (diff)
downloadlinux-c1144d29f405ce1f4e6ede6482beb3d0d09750c6.tar.xz
linux-c1144d29f405ce1f4e6ede6482beb3d0d09750c6.zip
Merge branch 'for-4.18/alps' into for-linus
hid-alps driver cleanups wrt. t4_read_write_register() handling from Christophe Jaillet
Diffstat (limited to 'drivers/media/i2c/adv748x/adv748x-afe.c')
-rw-r--r--drivers/media/i2c/adv748x/adv748x-afe.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/media/i2c/adv748x/adv748x-afe.c b/drivers/media/i2c/adv748x/adv748x-afe.c
index 5188178588c9..61514bae7e5c 100644
--- a/drivers/media/i2c/adv748x/adv748x-afe.c
+++ b/drivers/media/i2c/adv748x/adv748x-afe.c
@@ -275,7 +275,8 @@ static int adv748x_afe_s_stream(struct v4l2_subdev *sd, int enable)
{
struct adv748x_afe *afe = adv748x_sd_to_afe(sd);
struct adv748x_state *state = adv748x_afe_to_state(afe);
- int ret, signal = V4L2_IN_ST_NO_SIGNAL;
+ u32 signal = V4L2_IN_ST_NO_SIGNAL;
+ int ret;
mutex_lock(&state->mutex);