1 files changed, 6 insertions, 7 deletions

diff --git a/drivers/char/tpm/tpm_vtpm_proxy.c b/drivers/char/tpm/tpm_vtpm_proxy.c
index 3d6f6ca81def..5463b58af26e 100644
--- a/drivers/char/tpm/tpm_vtpm_proxy.c
+++ b/drivers/char/tpm/tpm_vtpm_proxy.c
@@ -42,6 +42,7 @@ struct proxy_dev {
         long state;                  /* internal state */
 #define STATE_OPENED_FLAG        BIT(0)
 #define STATE_WAIT_RESPONSE_FLAG BIT(1)  /* waiting for emulator response */
+#define STATE_REGISTERED_FLAG    BIT(2)
 
         size_t req_len;              /* length of queued TPM request */
         size_t resp_len;             /* length of queued TPM response */
@@ -370,12 +371,9 @@ static void vtpm_proxy_work(struct work_struct *work)
 
         rc = tpm_chip_register(proxy_dev->chip);
         if (rc)
-                goto err;
-
-        return;
-
-err:
-        vtpm_proxy_fops_undo_open(proxy_dev);
+                vtpm_proxy_fops_undo_open(proxy_dev);
+        else
+                proxy_dev->state |= STATE_REGISTERED_FLAG;
 }
 
 /*
@@ -516,7 +514,8 @@ static void vtpm_proxy_delete_device(struct proxy_dev *proxy_dev)
          */
         vtpm_proxy_fops_undo_open(proxy_dev);
 
-        tpm_chip_unregister(proxy_dev->chip);
+        if (proxy_dev->state & STATE_REGISTERED_FLAG)
+                tpm_chip_unregister(proxy_dev->chip);
 
         vtpm_proxy_delete_proxy_dev(proxy_dev);
 }