ia64/xen-unstable

changeset 10032:0ee5869b4894

Fix a couple of problems in the TPM backend driver.
Signed-off-by: Stefan Berger <stefanb@us.ibm.com>
author kaf24@firebug.cl.cam.ac.uk
date Wed May 10 15:58:16 2006 +0100 (2006-05-10)
parents 8f02d7cb222a
children 8685b64538fa
files linux-2.6-xen-sparse/drivers/char/tpm/tpm_xen.c linux-2.6-xen-sparse/drivers/xen/tpmback/interface.c
line diff
     1.1 --- a/linux-2.6-xen-sparse/drivers/char/tpm/tpm_xen.c	Wed May 10 15:49:47 2006 +0100
     1.2 +++ b/linux-2.6-xen-sparse/drivers/char/tpm/tpm_xen.c	Wed May 10 15:58:16 2006 +0100
     1.3 @@ -745,9 +745,9 @@ failexit:
     1.4  
     1.5  static void __exit tpmif_exit(void)
     1.6  {
     1.7 +	exit_tpm_xenbus();
     1.8  	cleanup_vtpm();
     1.9  	tpm_private_put();
    1.10 -	exit_tpm_xenbus();
    1.11  	gnttab_free_grant_references(gref_head);
    1.12  }
    1.13  
     2.1 --- a/linux-2.6-xen-sparse/drivers/xen/tpmback/interface.c	Wed May 10 15:49:47 2006 +0100
     2.2 +++ b/linux-2.6-xen-sparse/drivers/xen/tpmback/interface.c	Wed May 10 15:58:16 2006 +0100
     2.3 @@ -179,7 +179,7 @@ void __init tpmif_interface_init(void)
     2.4  					 0, 0, NULL, NULL);
     2.5  }
     2.6  
     2.7 -void __init tpmif_interface_exit(void)
     2.8 +void __exit tpmif_interface_exit(void)
     2.9  {
    2.10  	kmem_cache_destroy(tpmif_cachep);
    2.11  }