[media] media-device: split media initialization and registration

[deliverable/linux.git] / drivers / media / usb / siano / smsusb.c

diff --git a/drivers/media/usb/siano/smsusb.c b/drivers/media/usb/siano/smsusb.c
index c945e4c2fbd49cdb0ffab93a53cd72ee37e81db7..8abbd3cc8eba7ebbdf734e4c151e7bff98630a11 100644 (file)
--- a/drivers/media/usb/siano/smsusb.c
+++ b/drivers/media/usb/siano/smsusb.c
@@ -361,10 +361,11 @@ static void *siano_media_device_register(struct smsusb_device_t *dev,
        mdev->hw_revision = le16_to_cpu(udev->descriptor.bcdDevice);
        mdev->driver_version = LINUX_VERSION_CODE;
 
+       media_device_init(mdev);
+
        ret = media_device_register(mdev);
        if (ret) {
-               pr_err("Couldn't create a media device. Error: %d\n",
-                       ret);
+               media_device_cleanup(mdev);
                kfree(mdev);
                return NULL;
        }