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

Merge tag 'v3.19-rc4' into next

Browse Source 
Merge with mainline to bring in the latest thermal and other changes.
This commit is contained in:
Dmitry Torokhov
2015-01-15 09:46:14 -08:00
parent 0c3e99437a eaa27f34e9
commit 0c49cd295d
15497 changed files with 878449 additions and 621464 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/input/mouse/psmouse-base.c
View File

@@ -1548,16 +1548,9 @@ static int psmouse_reconnect(struct serio *serio)
{
struct psmouse *psmouse = serio_get_drvdata(serio);
struct psmouse *parent = NULL;
struct serio_driver *drv = serio->drv;
unsigned char type;
int rc = -1;
if (!drv || !psmouse) {
psmouse_dbg(psmouse,
"reconnect request, but serio is disconnected, ignoring...\n");
return -1;
}
mutex_lock(&psmouse_mutex);
if (serio->parent && serio->id.type == SERIO_PS_PSTHRU) {