Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/dev/pckbport Return res in non-synaptics case like befor...



details:   https://anonhg.NetBSD.org/src/rev/c567af6cac70
branches:  trunk
changeset: 357363:c567af6cac70
user:      ryoon <ryoon%NetBSD.org@localhost>
date:      Tue Nov 07 12:39:07 2017 +0000

description:
Return res in non-synaptics case like before. Fix ALPS case

diffstat:

 sys/dev/pckbport/synaptics.c |  7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diffs (28 lines):

diff -r cca0c8421f09 -r c567af6cac70 sys/dev/pckbport/synaptics.c
--- a/sys/dev/pckbport/synaptics.c      Tue Nov 07 09:26:55 2017 +0000
+++ b/sys/dev/pckbport/synaptics.c      Tue Nov 07 12:39:07 2017 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: synaptics.c,v 1.34 2017/11/06 21:07:17 blymn Exp $     */
+/*     $NetBSD: synaptics.c,v 1.35 2017/11/07 12:39:07 ryoon Exp $     */
 
 /*
  * Copyright (c) 2005, Steve C. Woodford
@@ -48,7 +48,7 @@
 #include "opt_pms.h"
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: synaptics.c,v 1.34 2017/11/06 21:07:17 blymn Exp $");
+__KERNEL_RCSID(0, "$NetBSD: synaptics.c,v 1.35 2017/11/07 12:39:07 ryoon Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -316,7 +316,8 @@
                 * Reset device in case the probe confused it.
                 */
  doreset:
-               return synaptics_poll_reset(psc);
+               (void)synaptics_poll_reset(psc);
+               return res;
        }
 
        if (resp[1] != SYNAPTICS_MAGIC_BYTE) {



Home | Main Index | Thread Index | Old Index