]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
TPM: Fixup boot probe timeout for tpm_tis driver
authorJason Gunthorpe <jgunthorpe@obsidianresearch.com>
Wed, 9 Sep 2009 23:22:18 +0000 (17:22 -0600)
committerGreg Kroah-Hartman <gregkh@suse.de>
Thu, 24 Sep 2009 15:43:52 +0000 (08:43 -0700)
commit1e3474abd6ef1fb73773f2ba85874995c82b28b7
tree6a3828aa5879b1f75789cd0de3a8348c59cb2e99
parent4e499625e94ea62f93d91832e5a804555b0ea222
TPM: Fixup boot probe timeout for tpm_tis driver

commit ec57935837a78f9661125b08a5d08b697568e040 upstream.

When probing the device in tpm_tis_init the call request_locality
uses timeout_a, which wasn't being initalized until after
request_locality. This results in request_locality falsely timing
out if the chip is still starting. Move the initialization to before
request_locality.

This probably only matters for embedded cases (ie mine), a BIOS likely
gets the TPM into a state where this code path isn't necessary.

Signed-off-by: Jason Gunthorpe <jgunthorpe@obsidianresearch.com>
Acked-by: Rajiv Andrade <srajiv@linux.vnet.ibm.com>
Signed-off-by: James Morris <jmorris@namei.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
drivers/char/tpm/tpm_tis.c