diff --git a/drivers/media/usb/em28xx/em28xx-cards.c b/drivers/media/usb/em28xx/em28xx-cards.c
index c1e0dccb7408..f22e5ca2d1b3 100644
--- a/drivers/media/usb/em28xx/em28xx-cards.c
+++ b/drivers/media/usb/em28xx/em28xx-cards.c
@@ -3626,7 +3626,7 @@ static int em28xx_init_dev(struct em28xx *dev, struct usb_device *udev,
 	if (dev->is_audio_only) {
 		retval = em28xx_audio_setup(dev);
 		if (retval)
-			return -ENODEV;
+			goto deinit_media;
 		em28xx_init_extension(dev);
 
 		return 0;
@@ -3645,7 +3645,7 @@ static int em28xx_init_dev(struct em28xx *dev, struct usb_device *udev,
 		dev_err(&dev->intf->dev,
 			"%s: em28xx_i2c_register bus 0 - error [%d]!\n",
 		       __func__, retval);
-		return retval;
+		goto deinit_media;
 	}
 
 	/* register i2c bus 1 */
@@ -3663,7 +3663,7 @@ static int em28xx_init_dev(struct em28xx *dev, struct usb_device *udev,
 
 			em28xx_i2c_unregister(dev, 0);
 
-			return retval;
+			goto deinit_media;
 		}
 	}
 
@@ -3671,6 +3671,10 @@ static int em28xx_init_dev(struct em28xx *dev, struct usb_device *udev,
 	em28xx_card_setup(dev);
 
 	return 0;
+
+deinit_media:
+	em28xx_unregister_media_device(dev);
+	return retval;
 }
 
 static int em28xx_duplicate_dev(struct em28xx *dev)