diff --git a/drivers/usb/misc/chaoskey.c b/drivers/usb/misc/chaoskey.c
index 87067c3d6109..b3a52e3b139c 100644
--- a/drivers/usb/misc/chaoskey.c
+++ b/drivers/usb/misc/chaoskey.c
@@ -228,8 +228,10 @@ static void chaoskey_disconnect(struct usb_interface *interface)
 		return;
 	}
 
-	if (dev->hwrng_registered)
+	if (dev->hwrng_registered) {
 		hwrng_unregister(&dev->hwrng);
+		dev->hwrng_registered = 0;
+	}
 
 	usb_deregister_dev(interface, &chaoskey_class);