From: Olof Johansson <olof@lixom.net>
Date: Fri, 7 Jan 2011 03:24:01 +0000 (-0600)
Subject: tpm: fix panic caused by "tpm: Autodetect itpm devices"
X-Git-Tag: v2.6.37.1~49
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=719ab9fc03934405d9342239b956b42c1d6a8b9f;p=pandora-kernel.git

tpm: fix panic caused by "tpm: Autodetect itpm devices"

commit e5cce6c13c25d9ac56955a3ae2fd562719848172 upstream.

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>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---

Reading git-diff-tree failed