[media] media_device: move allocation out of media_device_*_init

[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 4a0def1e15287d3b8dfdfc31a5b455e04982bfad..c2e25876e93b266e6e450296e9f2510d18c95364 100644 (file)
--- a/drivers/media/usb/siano/smsusb.c
+++ b/drivers/media/usb/siano/smsusb.c
@@ -367,10 +367,12 @@ static void *siano_media_device_register(struct smsusb_device_t *dev,
        struct sms_board *board = sms_get_board(board_id);
        int ret;
 
-       mdev = media_device_usb_init(udev, board->name);
+       mdev = kzalloc(sizeof(*mdev), GFP_KERNEL);
        if (!mdev)
                return NULL;
 
+       media_device_usb_init(mdev, udev, board->name);
+
        ret = media_device_register(mdev);
        if (ret) {
                media_device_cleanup(mdev);