diff --git a/kernel/ethosu_device.c b/kernel/ethosu_device.c
index 0b6fdfa..6987215 100644
--- a/kernel/ethosu_device.c
+++ b/kernel/ethosu_device.c
@@ -441,8 +441,11 @@
 	/* Create device object */
 	ret = ethosu_device_register(&edev->dev, &rpdev->dev, edev,
 				     devt);
-	if (ret)
-		goto free_edev;
+	if (ret) {
+		kfree(edev);
+
+		return ret;
+	}
 
 	/* Continue with new device */
 	dev = &edev->dev;
@@ -506,9 +509,6 @@
 device_unregister:
 	device_unregister(dev);
 
-free_edev:
-	kfree(edev);
-
 	return ret;
 }