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 98a21bcc665db167337a67327f4b3f68ba7768bc..0bd32ce916d8539cebf8447ef90bb6d1d244a9a7 100644 (file)
--- 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 (file)
index 55662ae..0000000
--- 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 <stefanb@linux.vnet.ibm.com>
-Date: Fri, 11 Nov 2011 12:57:06 -0500
-Subject: tpm_tis: add delay after aborting command
-
-From: Stefan Berger <stefanb@linux.vnet.ibm.com>
-
-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 <stefanb@linux.vnet.ibm.com>
-Signed-off-by: Rajiv Andrade <srajiv@linux.vnet.ibm.com>
-Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-
----
- 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;
- }