shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-09 12:17:12 +09:00
Code Issues Packages Projects Releases Wiki Activity

drivers: input: touch: fix bug system hang when cyttsp5 is not connected.

Browse Source 
Signed-off-by: Wenping Zhang <wenping.zhang@rock-chips.com>
Change-Id: I7fd72a30b77ae3396c2220588794b03d78ed8642
This commit is contained in:
Wenping Zhang
2020-12-19 02:25:13 +00:00
committed by Tao Huang
parent d8fa472205
commit b2fd919bec
2 changed files with 21 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
drivers/input/touchscreen/cyttsp5/cyttsp5_core.c
View File

@@ -6079,17 +6079,6 @@ int cyttsp5_probe(const struct cyttsp5_bus_ops *ops, struct device *dev,
*/
cyttsp5_bus_ops_save = ops;
/* Call platform init function */
if (cd->cpdata->init) {
parade_debug(cd->dev, DEBUG_LEVEL_1, "%s: Init HW\n", __func__);
rc = cd->cpdata->init(cd->cpdata, 1, cd->dev);
} else {
dev_info(cd->dev, "%s: No HW INIT function\n", __func__);
rc = 0;
}
if (rc < 0)
dev_err(cd->dev, "%s: HW Init fail r=%d\n", __func__, rc);
/* Call platform detect function */
if (cd->cpdata->detect) {
dev_info(cd->dev, "%s: Detect HW\n", __func__);

22
drivers/input/touchscreen/cyttsp5/cyttsp5_i2c.c
View File

@@ -136,6 +136,7 @@ static int cyttsp5_i2c_probe(struct i2c_client *client,
#ifdef CONFIG_TOUCHSCREEN_CYPRESS_CYTTSP5_DEVICETREE_SUPPORT
const struct of_device_id *match;
#endif
struct cyttsp5_platform_data *pdata;
int rc;
printk("*****cyttsp5_i2c_probe start \n");
@@ -153,7 +154,26 @@ static int cyttsp5_i2c_probe(struct i2c_client *client,
return rc;
}
#endif
pdata = dev_get_platdata(dev);
if (pdata && pdata->core_pdata) {
char buf[32];
/* Call platform init function */
if (pdata->core_pdata->init) {
dev_info(dev, "%s: Init HW\n", __func__);
rc = pdata->core_pdata->init(pdata->core_pdata, 1, dev);
if (rc < 0) {
dev_err(dev, "%s: HW Init fail %d\n", __func__, rc);
return -EIO;
}
} else {
dev_info(dev, "%s: No HW INIT function\n", __func__);
}
rc = cyttsp5_i2c_read_default(&client->dev, buf, 16);
if (rc < 0) {
dev_err(dev, "%s, read_default rc=%d\n", __func__, rc);
return -ENODEV;
}
}
rc = cyttsp5_probe(&cyttsp5_i2c_bus_ops, &client->dev, client->irq,
CY_I2C_DATA_SIZE);