From: Greg Kroah-Hartman Date: Thu, 26 Jan 2012 21:20:44 +0000 (-0800) Subject: remove queue-3.0/tpm_tis-add-delay-after-aborting-command.patch X-Git-Tag: v3.0.19~22 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e4a80d4d86b039deed21183bf3cd5cd579f28943;p=thirdparty%2Fkernel%2Fstable-queue.git remove queue-3.0/tpm_tis-add-delay-after-aborting-command.patch --- diff --git a/queue-3.0/series b/queue-3.0/series index 98a21bcc665..0bd32ce916d 100644 --- a/queue-3.0/series +++ b/queue-3.0/series @@ -9,7 +9,6 @@ drm-fix-authentication-kernel-crash.patch xfs-fix-missing-xfs_iunlock-on-error-recovery-path-in-xfs_readlink.patch crypto-sha512-make-it-work-undo-percpu-message-schedule.patch crypto-sha512-reduce-stack-usage-to-safe-number.patch -tpm_tis-add-delay-after-aborting-command.patch ftrace-balance-records-when-updating-the-hash.patch ftrace-update-filter-when-tracing-enabled-in-set_ftrace_filter.patch ftrace-fix-unregister-ftrace_ops-accounting.patch diff --git a/queue-3.0/tpm_tis-add-delay-after-aborting-command.patch b/queue-3.0/tpm_tis-add-delay-after-aborting-command.patch deleted file mode 100644 index 55662aec3e2..00000000000 --- a/queue-3.0/tpm_tis-add-delay-after-aborting-command.patch +++ /dev/null @@ -1,35 +0,0 @@ -From a927b8131794ee449b7f6666e7ab61301949b20f Mon Sep 17 00:00:00 2001 -From: Stefan Berger -Date: Fri, 11 Nov 2011 12:57:06 -0500 -Subject: tpm_tis: add delay after aborting command - -From: Stefan Berger - -commit a927b8131794ee449b7f6666e7ab61301949b20f upstream. - -This patch adds a delay after aborting a command. Some TPMs need -this and will not process the subsequent command correctly otherwise. - -It's worth noting that a TPM randomly failing to process a command, -maps to randomly failing suspend/resume operations. - -Signed-off-by: Stefan Berger -Signed-off-by: Rajiv Andrade -Signed-off-by: Greg Kroah-Hartman - ---- - drivers/char/tpm/tpm_tis.c | 3 +++ - 1 file changed, 3 insertions(+) - ---- a/drivers/char/tpm/tpm_tis.c -+++ b/drivers/char/tpm/tpm_tis.c -@@ -354,6 +354,9 @@ static int tpm_tis_send(struct tpm_chip - return len; - out_err: - tpm_tis_ready(chip); -+ /* some TPMs need a break here otherwise they will not work -+ * correctly on the immediately subsequent command */ -+ msleep(chip->vendor.timeout_b); - release_locality(chip, chip->vendor.locality, 0); - return rc; - }