1.1 --- a/linux-2.6-xen-sparse/drivers/char/tpm/tpm_xen.c	Fri Mar 02 16:29:48 2007 +0000
     1.2 +++ b/linux-2.6-xen-sparse/drivers/char/tpm/tpm_xen.c	Fri Mar 02 16:57:24 2007 +0000
     1.3 @@ -437,7 +437,7 @@ static int tpmfront_suspend(struct xenbu
     1.4  	return 0;
     1.5  }
     1.6  
     1.7 -static int tpmfront_resume(struct tpm_private *tp)
     1.8 +static int tpmfront_suspend_finish(struct tpm_private *tp)
     1.9  {
    1.10  	tp->is_suspended = 0;
    1.11  	/* Allow applications to send again. */
    1.12 @@ -448,7 +448,7 @@ static int tpmfront_resume(struct tpm_pr
    1.13  static int tpmfront_suspend_cancel(struct xenbus_device *dev)
    1.14  {
    1.15  	struct tpm_private *tp = tpm_private_from_dev(&dev->dev);
    1.16 -	return tpmfront_resume(tp);
    1.17 +	return tpmfront_suspend_finish(tp);
    1.18  }
    1.19  
    1.20  static int tpmfront_resume(struct xenbus_device *dev)
    1.21 @@ -691,7 +691,7 @@ static void tpmif_set_connected_state(st
    1.22  	 * This also removes the suspend state.
    1.23  	 */
    1.24  	if (is_connected == 1 && tp->is_suspended == 1)
    1.25 -		tpmfront_resume(tp);
    1.26 +		tpmfront_suspend_finish(tp);
    1.27  
    1.28  	if (is_connected != tp->is_connected) {
    1.29  		tp->is_connected = is_connected;