BugLink: http://bugs.launchpad.net/bugs/1398274

Fixed the rollback and gave more self-documenting names for the
functions.

Fixes: d972b052 ("tpm: fix call order in tpm-chip.c")
Signed-off-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
cc: stable@vger.kernel.org
Reviewed-by: Jason Gunthorpe <jgunthorpe@obsidianresearch.com>
(cherry picked from commit 72c91ce8)
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>