Merge tag 'v4.11-rc5' into next
Sync up with mainline to bring in changes to input subsystem merged through other trees.
This commit is contained in:
Dmitry Torokhov
@@ -202,7 +202,7 @@ static int cyttsp4_si_get_cydata(struct cyttsp4 *cd)
|
||||
int rc;
|
||||
|
||||
si->si_ofs.cydata_size = si->si_ofs.test_ofs - si->si_ofs.cydata_ofs;
|
||||
dev_dbg(cd->dev, "%s: cydata size: %Zd\n", __func__,
|
||||
dev_dbg(cd->dev, "%s: cydata size: %zd\n", __func__,
|
||||
si->si_ofs.cydata_size);
|
||||
|
||||
p = krealloc(si->si_ptrs.cydata, si->si_ofs.cydata_size, GFP_KERNEL);
|
||||
@@ -430,13 +430,13 @@ static int cyttsp4_si_get_opcfg_data(struct cyttsp4 *cd)
|
||||
for (abs = 0; abs < CY_TCH_NUM_ABS; abs++) {
|
||||
dev_dbg(cd->dev, "%s: tch_rec_%s\n", __func__,
|
||||
cyttsp4_tch_abs_string[abs]);
|
||||
dev_dbg(cd->dev, "%s: ofs =%2Zd\n", __func__,
|
||||
dev_dbg(cd->dev, "%s: ofs =%2zd\n", __func__,
|
||||
si->si_ofs.tch_abs[abs].ofs);
|
||||
dev_dbg(cd->dev, "%s: siz =%2Zd\n", __func__,
|
||||
dev_dbg(cd->dev, "%s: siz =%2zd\n", __func__,
|
||||
si->si_ofs.tch_abs[abs].size);
|
||||
dev_dbg(cd->dev, "%s: max =%2Zd\n", __func__,
|
||||
dev_dbg(cd->dev, "%s: max =%2zd\n", __func__,
|
||||
si->si_ofs.tch_abs[abs].max);
|
||||
dev_dbg(cd->dev, "%s: bofs=%2Zd\n", __func__,
|
||||
dev_dbg(cd->dev, "%s: bofs=%2zd\n", __func__,
|
||||
si->si_ofs.tch_abs[abs].bofs);
|
||||
}
|
||||
|
||||
@@ -586,62 +586,62 @@ static int cyttsp4_si_get_op_data_ptrs(struct cyttsp4 *cd)
|
||||
static void cyttsp4_si_put_log_data(struct cyttsp4 *cd)
|
||||
{
|
||||
struct cyttsp4_sysinfo *si = &cd->sysinfo;
|
||||
dev_dbg(cd->dev, "%s: cydata_ofs =%4Zd siz=%4Zd\n", __func__,
|
||||
dev_dbg(cd->dev, "%s: cydata_ofs =%4zd siz=%4zd\n", __func__,
|
||||
si->si_ofs.cydata_ofs, si->si_ofs.cydata_size);
|
||||
dev_dbg(cd->dev, "%s: test_ofs =%4Zd siz=%4Zd\n", __func__,
|
||||
dev_dbg(cd->dev, "%s: test_ofs =%4zd siz=%4zd\n", __func__,
|
||||
si->si_ofs.test_ofs, si->si_ofs.test_size);
|
||||
dev_dbg(cd->dev, "%s: pcfg_ofs =%4Zd siz=%4Zd\n", __func__,
|
||||
dev_dbg(cd->dev, "%s: pcfg_ofs =%4zd siz=%4zd\n", __func__,
|
||||
si->si_ofs.pcfg_ofs, si->si_ofs.pcfg_size);
|
||||
dev_dbg(cd->dev, "%s: opcfg_ofs =%4Zd siz=%4Zd\n", __func__,
|
||||
dev_dbg(cd->dev, "%s: opcfg_ofs =%4zd siz=%4zd\n", __func__,
|
||||
si->si_ofs.opcfg_ofs, si->si_ofs.opcfg_size);
|
||||
dev_dbg(cd->dev, "%s: ddata_ofs =%4Zd siz=%4Zd\n", __func__,
|
||||
dev_dbg(cd->dev, "%s: ddata_ofs =%4zd siz=%4zd\n", __func__,
|
||||
si->si_ofs.ddata_ofs, si->si_ofs.ddata_size);
|
||||
dev_dbg(cd->dev, "%s: mdata_ofs =%4Zd siz=%4Zd\n", __func__,
|
||||
dev_dbg(cd->dev, "%s: mdata_ofs =%4zd siz=%4zd\n", __func__,
|
||||
si->si_ofs.mdata_ofs, si->si_ofs.mdata_size);
|
||||
|
||||
dev_dbg(cd->dev, "%s: cmd_ofs =%4Zd\n", __func__,
|
||||
dev_dbg(cd->dev, "%s: cmd_ofs =%4zd\n", __func__,
|
||||
si->si_ofs.cmd_ofs);
|
||||
dev_dbg(cd->dev, "%s: rep_ofs =%4Zd\n", __func__,
|
||||
dev_dbg(cd->dev, "%s: rep_ofs =%4zd\n", __func__,
|
||||
si->si_ofs.rep_ofs);
|
||||
dev_dbg(cd->dev, "%s: rep_sz =%4Zd\n", __func__,
|
||||
dev_dbg(cd->dev, "%s: rep_sz =%4zd\n", __func__,
|
||||
si->si_ofs.rep_sz);
|
||||
dev_dbg(cd->dev, "%s: num_btns =%4Zd\n", __func__,
|
||||
dev_dbg(cd->dev, "%s: num_btns =%4zd\n", __func__,
|
||||
si->si_ofs.num_btns);
|
||||
dev_dbg(cd->dev, "%s: num_btn_regs =%4Zd\n", __func__,
|
||||
dev_dbg(cd->dev, "%s: num_btn_regs =%4zd\n", __func__,
|
||||
si->si_ofs.num_btn_regs);
|
||||
dev_dbg(cd->dev, "%s: tt_stat_ofs =%4Zd\n", __func__,
|
||||
dev_dbg(cd->dev, "%s: tt_stat_ofs =%4zd\n", __func__,
|
||||
si->si_ofs.tt_stat_ofs);
|
||||
dev_dbg(cd->dev, "%s: tch_rec_size =%4Zd\n", __func__,
|
||||
dev_dbg(cd->dev, "%s: tch_rec_size =%4zd\n", __func__,
|
||||
si->si_ofs.tch_rec_size);
|
||||
dev_dbg(cd->dev, "%s: max_tchs =%4Zd\n", __func__,
|
||||
dev_dbg(cd->dev, "%s: max_tchs =%4zd\n", __func__,
|
||||
si->si_ofs.max_tchs);
|
||||
dev_dbg(cd->dev, "%s: mode_size =%4Zd\n", __func__,
|
||||
dev_dbg(cd->dev, "%s: mode_size =%4zd\n", __func__,
|
||||
si->si_ofs.mode_size);
|
||||
dev_dbg(cd->dev, "%s: data_size =%4Zd\n", __func__,
|
||||
dev_dbg(cd->dev, "%s: data_size =%4zd\n", __func__,
|
||||
si->si_ofs.data_size);
|
||||
dev_dbg(cd->dev, "%s: map_sz =%4Zd\n", __func__,
|
||||
dev_dbg(cd->dev, "%s: map_sz =%4zd\n", __func__,
|
||||
si->si_ofs.map_sz);
|
||||
|
||||
dev_dbg(cd->dev, "%s: btn_rec_size =%2Zd\n", __func__,
|
||||
dev_dbg(cd->dev, "%s: btn_rec_size =%2zd\n", __func__,
|
||||
si->si_ofs.btn_rec_size);
|
||||
dev_dbg(cd->dev, "%s: btn_diff_ofs =%2Zd\n", __func__,
|
||||
dev_dbg(cd->dev, "%s: btn_diff_ofs =%2zd\n", __func__,
|
||||
si->si_ofs.btn_diff_ofs);
|
||||
dev_dbg(cd->dev, "%s: btn_diff_size =%2Zd\n", __func__,
|
||||
dev_dbg(cd->dev, "%s: btn_diff_size =%2zd\n", __func__,
|
||||
si->si_ofs.btn_diff_size);
|
||||
|
||||
dev_dbg(cd->dev, "%s: max_x = 0x%04ZX (%Zd)\n", __func__,
|
||||
dev_dbg(cd->dev, "%s: max_x = 0x%04zX (%zd)\n", __func__,
|
||||
si->si_ofs.max_x, si->si_ofs.max_x);
|
||||
dev_dbg(cd->dev, "%s: x_origin = %Zd (%s)\n", __func__,
|
||||
dev_dbg(cd->dev, "%s: x_origin = %zd (%s)\n", __func__,
|
||||
si->si_ofs.x_origin,
|
||||
si->si_ofs.x_origin == CY_NORMAL_ORIGIN ?
|
||||
"left corner" : "right corner");
|
||||
dev_dbg(cd->dev, "%s: max_y = 0x%04ZX (%Zd)\n", __func__,
|
||||
dev_dbg(cd->dev, "%s: max_y = 0x%04zX (%zd)\n", __func__,
|
||||
si->si_ofs.max_y, si->si_ofs.max_y);
|
||||
dev_dbg(cd->dev, "%s: y_origin = %Zd (%s)\n", __func__,
|
||||
dev_dbg(cd->dev, "%s: y_origin = %zd (%s)\n", __func__,
|
||||
si->si_ofs.y_origin,
|
||||
si->si_ofs.y_origin == CY_NORMAL_ORIGIN ?
|
||||
"upper corner" : "lower corner");
|
||||
dev_dbg(cd->dev, "%s: max_p = 0x%04ZX (%Zd)\n", __func__,
|
||||
dev_dbg(cd->dev, "%s: max_p = 0x%04zX (%zd)\n", __func__,
|
||||
si->si_ofs.max_p, si->si_ofs.max_p);
|
||||
|
||||
dev_dbg(cd->dev, "%s: xy_mode=%p xy_data=%p\n", __func__,
|
||||
@@ -1000,7 +1000,7 @@ static int cyttsp4_xy_worker(struct cyttsp4 *cd)
|
||||
dev_dbg(dev, "%s: Large area detected\n", __func__);
|
||||
|
||||
if (num_cur_tch > si->si_ofs.max_tchs) {
|
||||
dev_err(dev, "%s: too many tch; set to max tch (n=%d c=%Zd)\n",
|
||||
dev_err(dev, "%s: too many tch; set to max tch (n=%d c=%zd)\n",
|
||||
__func__, num_cur_tch, si->si_ofs.max_tchs);
|
||||
num_cur_tch = si->si_ofs.max_tchs;
|
||||
}
|
||||
|
||||
@@ -527,6 +527,9 @@ static int sur40_probe(struct usb_interface *interface,
|
||||
if (iface_desc->desc.bInterfaceClass != 0xFF)
|
||||
return -ENODEV;
|
||||
|
||||
if (iface_desc->desc.bNumEndpoints < 5)
|
||||
return -ENODEV;
|
||||
|
||||
/* Use endpoint #4 (0x86). */
|
||||
endpoint = &iface_desc->endpoint[4].desc;
|
||||
if (endpoint->bEndpointAddress != TOUCH_ENDPOINT)
|
||||
|
||||
Reference in New Issue
Block a user