From patchwork Tue Apr 20 00:37:37 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christoph Fritz X-Patchwork-Id: 93582 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.3/8.14.3) with ESMTP id o3K0WFbj006431 for ; Tue, 20 Apr 2010 00:32:15 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752671Ab0DTAcM (ORCPT ); Mon, 19 Apr 2010 20:32:12 -0400 Received: from fg-out-1718.google.com ([72.14.220.153]:45004 "EHLO fg-out-1718.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752454Ab0DTAcL (ORCPT ); Mon, 19 Apr 2010 20:32:11 -0400 Received: by fg-out-1718.google.com with SMTP id d23so2227708fga.1 for ; Mon, 19 Apr 2010 17:32:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=gamma; h=domainkey-signature:received:received:subject:from:to:cc :in-reply-to:references:content-type:date:message-id:mime-version :x-mailer:content-transfer-encoding; bh=gWNCvMEI8JFMGmSJmLVhOuUluoUz5lzwu5dKpr/tEXU=; b=VVrDMAHhAuQJVNfyNlFwVQuVlus2pwLlfLAplw13k2XnpM27oO3bsAQIqZ3tF5rEZG xA9y2RYovNxxmwBGRwLapd97dQ6SzoY4uEoYIMX0pnr9vYQtmSLztRYALTHAENb42kQl 72pzb8lIyQeNAnmF/++ysqTGBhSQziuGf9jkY= DomainKey-Signature: a=rsa-sha1; c=nofws; d=googlemail.com; s=gamma; h=subject:from:to:cc:in-reply-to:references:content-type:date :message-id:mime-version:x-mailer:content-transfer-encoding; b=GERZ++vpTZnbsroJ2lPDBwMK1v6Ov6ZO0iirsxJJm4v4GSPYaSfzJ31CxKcRSyuhXw iUSbExe8PS7oIJrba6+meEg6cBRZCzQd52J9Do2zx54H9N7t/GrXnudWhEnE+AOcB2q7 U7paMK5wAf+blAnROtTjmrStRCwpu9tzfx0Zc= Received: by 10.223.30.7 with SMTP id s7mr1320371fac.6.1271723529599; Mon, 19 Apr 2010 17:32:09 -0700 (PDT) Received: from [127.0.0.1] (e180000139.adsl.alicedsl.de [85.180.0.139]) by mx.google.com with ESMTPS id 21sm1236949fkx.40.2010.04.19.17.32.07 (version=TLSv1/SSLv3 cipher=RC4-MD5); Mon, 19 Apr 2010 17:32:08 -0700 (PDT) Subject: Re: [PATCH] Reset ps/2 port should psmouse_probe fail before retrying From: Christoph Fritz To: "Peter M. Petrakis" Cc: linux-input@vger.kernel.org, rubini@cvml.unipv.it In-Reply-To: <4BCC77B4.5030703@canonical.com> References: <4BC8EA42.6030507@canonical.com> <1271502098.4155.27.camel@lovely> <4BC9D444.3090802@canonical.com> <1271523195.3676.5.camel@lovely> <4BCC77B4.5030703@canonical.com> Date: Tue, 20 Apr 2010 02:37:37 +0200 Message-Id: <1271723857.6652.6.camel@lovely> Mime-Version: 1.0 X-Mailer: Evolution 2.22.3.1 Sender: linux-input-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]); Tue, 20 Apr 2010 00:32:15 +0000 (UTC) diff --git a/drivers/input/serio/i8042.c b/drivers/input/serio/i8042.c index 6440a8f..1af5a58 100644 --- a/drivers/input/serio/i8042.c +++ b/drivers/input/serio/i8042.c @@ -1151,8 +1151,10 @@ static int i8042_pm_restore(struct device *dev) printk(KERN_WARNING "i8042: failed to resume active multiplexor, " "mouse won't work.\n"); - } else if (i8042_ports[I8042_AUX_PORT_NO].serio) + } else if (i8042_ports[I8042_AUX_PORT_NO].serio) { + i8042_toggle_aux(true); i8042_enable_aux_port(); + } if (i8042_ports[I8042_KBD_PORT_NO].serio) i8042_enable_kbd_port();