From patchwork Mon Dec 21 07:33:38 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Torokhov X-Patchwork-Id: 69088 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.3/8.14.2) with ESMTP id nBL7Xj1l004936 for ; Mon, 21 Dec 2009 07:33:45 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751605AbZLUHdo (ORCPT ); Mon, 21 Dec 2009 02:33:44 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752100AbZLUHdo (ORCPT ); Mon, 21 Dec 2009 02:33:44 -0500 Received: from mail-pw0-f42.google.com ([209.85.160.42]:43053 "EHLO mail-pw0-f42.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751605AbZLUHdn (ORCPT ); Mon, 21 Dec 2009 02:33:43 -0500 Received: by pwj9 with SMTP id 9so3023124pwj.21 for ; Sun, 20 Dec 2009 23:33:42 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:date:from:to:cc:subject :message-id:mime-version:content-type:content-disposition:user-agent; bh=WqlkdeFHYgnv2l2kBvuKVFUDUANm2ftZ811zGkd9JaA=; b=cP68t2394Eqimgy+YxThnzKhvTyXQRf+ErDk1QxmacZjtFYus53khEz1kwnuscroTh pEx6VwT5ClrX+fq7E9dZNTw7M36UVz57nz4ONLcEj3e12C99c+YR7cQJpDoC2lZInNtg 33KZM9IQ2Uji8iEAGP1XN9LOAP8Wd4xiiOKfg= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=date:from:to:cc:subject:message-id:mime-version:content-type :content-disposition:user-agent; b=XedSDH06HvmvrGNqpOEczl+MFMwRc7nCNOgYiqE37tC9/uZiiMOUkQ7/9KBGUsz/FT DmJlRVL6MC2KmwWq9AMdwqUpZTDwtK4BgJAgRX0xLLKm/PzqA6rSkZF0BCVp0EyZFx4D 6nMgrj29KecAW9aWZoGbaRVaSebkEvBhiJGiQ= Received: by 10.141.91.5 with SMTP id t5mr1787519rvl.186.1261380822744; Sun, 20 Dec 2009 23:33:42 -0800 (PST) Received: from mailhub.coreip.homeip.net (c-24-6-153-137.hsd1.ca.comcast.net [24.6.153.137]) by mx.google.com with ESMTPS id 22sm5025062pzk.10.2009.12.20.23.33.41 (version=TLSv1/SSLv3 cipher=RC4-MD5); Sun, 20 Dec 2009 23:33:41 -0800 (PST) Date: Sun, 20 Dec 2009 23:33:38 -0800 From: Dmitry Torokhov To: Linux Input Cc: "Rafael J. Wysocki" Subject: [PATCH] Input: serio - do not mark kseriod freezable anymore Message-ID: <20091221073338.GA3234@core.coreip.homeip.net> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.19 (2009-01-05) Sender: linux-input-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org diff --git a/drivers/input/serio/serio.c b/drivers/input/serio/serio.c index 0236f0d..e0f3018 100644 --- a/drivers/input/serio/serio.c +++ b/drivers/input/serio/serio.c @@ -284,13 +284,7 @@ static void serio_handle_event(void) mutex_lock(&serio_mutex); - /* - * Note that we handle only one event here to give swsusp - * a chance to freeze kseriod thread. Serio events should - * be pretty rare so we are not concerned about taking - * performance hit. - */ - if ((event = serio_get_event())) { + while ((event = serio_get_event())) { switch (event->type) { case SERIO_REGISTER_PORT: @@ -380,10 +374,9 @@ static struct serio *serio_get_pending_child(struct serio *parent) static int serio_thread(void *nothing) { - set_freezable(); do { serio_handle_event(); - wait_event_freezable(serio_wait, + wait_event_interruptible(serio_wait, kthread_should_stop() || !list_empty(&serio_event_list)); } while (!kthread_should_stop());