]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commit
tpm: fix panic caused by "tpm: Autodetect itpm devices"
authorOlof Johansson <olof@lixom.net>
Fri, 7 Jan 2011 03:24:01 +0000 (21:24 -0600)
committerJames Morris <jmorris@namei.org>
Mon, 24 Jan 2011 00:29:55 +0000 (11:29 +1100)
commite5cce6c13c25d9ac56955a3ae2fd562719848172
tree29ed2e65da52bda2d16a77425102f3a8813fcef1
parentc4ff4b829ef9e6353c0b133b7adb564a68054979
tpm: fix panic caused by "tpm: Autodetect itpm devices"

commit 3f0d3d016d89a5efb8b926d4707eb21fa13f3d27 adds a check for
PNP device id to the common tpm_tis_init() function, which in some
cases (force=1) will be called without the device being a member of
a pnp_dev. Oopsing and panics ensue.

Move the test up to before the call to tpm_tis_init(), since it
just modifies a global variable anyway.

Signed-off-by: Olof Johansson <olof@lixom.net>
Acked-by: Rajiv Andrade <srajiv@linux.vnet.ibm.com>
Signed-off-by: James Morris <jmorris@namei.org>
drivers/char/tpm/tpm_tis.c