leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge tag 'v5.5-rc5' into next

Browse Source 
Sync up with mainline to get SPI "delay" API changes.
This commit is contained in:
Dmitry Torokhov
2020-01-10 14:56:04 -08:00
parent 643dd74166 c79f46a282
commit 1bdd3e05a0
11724 changed files with 607273 additions and 287081 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/input/touchscreen/cyttsp4_core.c
View File

@@ -1990,11 +1990,6 @@ static int cyttsp4_mt_probe(struct cyttsp4 *cd)
/* get sysinfo */
md->si = &cd->sysinfo;
if (!md->si) {
dev_err(dev, "%s: Fail get sysinfo pointer from core p=%p\n",
__func__, md->si);
goto error_get_sysinfo;
}
rc = cyttsp4_setup_input_device(cd);
if (rc)
@@ -2004,8 +1999,6 @@ static int cyttsp4_mt_probe(struct cyttsp4 *cd)
error_init_input:
input_free_device(md->input);
error_get_sysinfo:
input_set_drvdata(md->input, NULL);
error_alloc_failed:
dev_err(dev, "%s failed.\n", __func__);
return rc;