xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'next' into for-linus

Browse Source 
Prepare input updates for 5.3 merge window.
This commit is contained in:
Dmitry Torokhov
2019-07-10 23:24:10 -07:00
parent f0dd687815 593fdd4fb4
commit 597473720f
19323 changed files with 1065339 additions and 560653 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
drivers/input/touchscreen/atmel_mxt_ts.c
View File

@@ -261,16 +261,6 @@ enum v4l_dbg_inputs {
MXT_V4L_INPUT_MAX,
};
static const struct v4l2_file_operations mxt_video_fops = {
.owner = THIS_MODULE,
.open = v4l2_fh_open,
.release = vb2_fop_release,
.unlocked_ioctl = video_ioctl2,
.read = vb2_fop_read,
.mmap = vb2_fop_mmap,
.poll = vb2_fop_poll,
};
enum mxt_suspend_mode {
MXT_SUSPEND_DEEP_SLEEP = 0,
MXT_SUSPEND_T9_CTRL = 1,
@@ -2224,6 +2214,16 @@ recheck:
}
#ifdef CONFIG_TOUCHSCREEN_ATMEL_MXT_T37
static const struct v4l2_file_operations mxt_video_fops = {
.owner = THIS_MODULE,
.open = v4l2_fh_open,
.release = vb2_fop_release,
.unlocked_ioctl = video_ioctl2,
.read = vb2_fop_read,
.mmap = vb2_fop_mmap,
.poll = vb2_fop_poll,
};
static u16 mxt_get_debug_value(struct mxt_data *data, unsigned int x,
unsigned int y)
{