From patchwork Mon Feb 21 16:34:47 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jiri Slaby X-Patchwork-Id: 577881 Received: from smtp1.linux-foundation.org (smtp1.linux-foundation.org [140.211.169.13]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id p1LGabS1006920 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=FAIL) for ; Mon, 21 Feb 2011 16:36:58 GMT Received: from daredevil.linux-foundation.org (localhost [127.0.0.1]) by smtp1.linux-foundation.org (8.14.2/8.13.5/Debian-3ubuntu1.1) with ESMTP id p1LGYvxF015643; Mon, 21 Feb 2011 08:34:58 -0800 Received: from mail-bw0-f41.google.com (mail-bw0-f41.google.com [209.85.214.41]) by smtp1.linux-foundation.org (8.14.2/8.13.5/Debian-3ubuntu1.1) with ESMTP id p1LGYqI1015630 (version=TLSv1/SSLv3 cipher=RC4-SHA bits=128 verify=FAIL) for ; Mon, 21 Feb 2011 08:34:55 -0800 Received: by bwz17 with SMTP id 17so1720376bwz.28 for ; Mon, 21 Feb 2011 08:34:52 -0800 (PST) Received: by 10.204.80.70 with SMTP id s6mr1558344bkk.142.1298306091941; Mon, 21 Feb 2011 08:34:51 -0800 (PST) Received: from [192.168.2.129] ([217.66.174.142]) by mx.google.com with ESMTPS id x38sm3835771bkj.13.2011.02.21.08.34.49 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 21 Feb 2011 08:34:50 -0800 (PST) Message-ID: <4D629427.8020500@gmail.com> Date: Mon, 21 Feb 2011 17:34:47 +0100 From: Jiri Slaby User-Agent: Mozilla/5.0 (X11; U; Linux x86_64; cs-CZ; rv:1.9.2.13) Gecko/20101206 SUSE/3.1.7 Thunderbird/3.1.7 MIME-Version: 1.0 To: Rajiv Andrade References: <4D60E93D.1050205@gmail.com> <4D60F108.9000106@gmail.com> <201102201151.11635.rjw@sisk.pl> <201102201248.10779.rjw@sisk.pl> <4D628521.8000205@linux.vnet.ibm.com> In-Reply-To: <4D628521.8000205@linux.vnet.ibm.com> X-Enigmail-Version: 1.1.2 Received-SPF: pass (localhost is always allowed.) X-Spam-Status: No, hits=-4.151 required=5 tests=AWL, BAYES_00, OSDL_HEADER_SPF_PASS, OSDL_HEADER_SUBJECT_BRACKETED X-Spam-Checker-Version: SpamAssassin 3.2.4-osdl_revision__1.47__ X-MIMEDefang-Filter: lf$Revision: 1.188 $ X-Scanned-By: MIMEDefang 2.63 on 140.211.169.21 Cc: stefanb@linux.vnet.ibm.com, Linux kernel mailing list , debora@linux.vnet.ibm.com, preining@logic.at, linux-pm , Linus Torvalds , stable@kernel.org Subject: Re: [linux-pm] 2.6.37.1 s2disk regression (TPM) X-BeenThere: linux-pm@lists.linux-foundation.org X-Mailman-Version: 2.1.9 Precedence: list List-Id: Linux power management List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: linux-pm-bounces@lists.linux-foundation.org Errors-To: linux-pm-bounces@lists.linux-foundation.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Mon, 21 Feb 2011 16:36:58 +0000 (UTC) --- a/drivers/char/tpm/tpm_tis.c +++ b/drivers/char/tpm/tpm_tis.c @@ -201,7 +201,7 @@ static int wait_for_stat(struct tpm_chip *chip, u8 mask, unsigned long timeout, ((tpm_tis_status (chip) & mask) == mask), timeout); - if (rc > 0) + if (rc > 0 || (tpm_tis_status(chip) & mask) == mask) return 0; } else {