From owner-svn-src-user@FreeBSD.ORG Tue Jul 15 22:16:47 2014 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 778EC6CC; Tue, 15 Jul 2014 22:16:47 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 6524E2B3A; Tue, 15 Jul 2014 22:16:47 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s6FMGlaE037151; Tue, 15 Jul 2014 22:16:47 GMT (envelope-from jceel@svn.freebsd.org) Received: (from jceel@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s6FMGltL037150; Tue, 15 Jul 2014 22:16:47 GMT (envelope-from jceel@svn.freebsd.org) Message-Id: <201407152216.s6FMGltL037150@svn.freebsd.org> From: Jakub Wojciech Klama Date: Tue, 15 Jul 2014 22:16:47 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r268716 - user/jceel/soc2014_evdev/head/sys/dev/atkbdc X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 15 Jul 2014 22:16:47 -0000 Author: jceel Date: Tue Jul 15 22:16:46 2014 New Revision: 268716 URL: http://svnweb.freebsd.org/changeset/base/268716 Log: Remove unneeded printf and fix obvious mistake in code. Modified: user/jceel/soc2014_evdev/head/sys/dev/atkbdc/psm.c Modified: user/jceel/soc2014_evdev/head/sys/dev/atkbdc/psm.c ============================================================================== --- user/jceel/soc2014_evdev/head/sys/dev/atkbdc/psm.c Tue Jul 15 21:13:08 2014 (r268715) +++ user/jceel/soc2014_evdev/head/sys/dev/atkbdc/psm.c Tue Jul 15 22:16:46 2014 (r268716) @@ -1113,7 +1113,7 @@ reinitialize(struct psm_softc *sc, int d splx(s); /* restore the driver state */ - if ((sc->state & PSM_OPEN) && (err == 0)) { + if ((sc->state & (PSM_OPEN | PSM_EV_OPEN)) && (err == 0)) { /* enable the aux device and the port again */ err = doopen(sc, c); if (err != 0) @@ -1602,15 +1602,16 @@ static int psm_ev_open(struct evdev_dev *evdev, void *ev_softc) { struct psm_softc *sc = (struct psm_softc *)ev_softc; - - printf("psm_ev_open()\n"); - - sc->state |= PSM_EV_OPEN; + int err; if (sc->state & PSM_OPEN) return (0); - return (psmopen(sc)); + err = psmopen(sc); + if (err == 0) + sc->state |= PSM_EV_OPEN; + + return (err); } static void @@ -3664,7 +3665,7 @@ psmsoftintr(void *arg) } #ifdef EVDEV - if (sc->flags & PSM_EV_OPEN) { + if (sc->state & PSM_EV_OPEN) { if (x != 0 || y != 0) { evdev_push_event(sc->evdev, EV_REL, REL_X, x); evdev_push_event(sc->evdev, EV_REL, REL_Y, y);