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

Right now, media_device_pci_init and media_device_usb_init does
media_device allocation internaly. That preents its usage when
the media_device struct is embedded on some other structure.

Move memory allocation outside it, to make it more generic.

Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>

1 files changed, 2 insertions, 1 deletions

diff --git a/drivers/media/pci/saa7134/saa7134-core.c b/drivers/media/pci/saa7134/saa7134-core.c
index 8ae65bb320a3..2e77a5a80119 100644
--- a/drivers/media/pci/saa7134/saa7134-core.c
+++ b/drivers/media/pci/saa7134/saa7134-core.c
@@ -1043,11 +1043,12 @@ static int saa7134_initdev(struct pci_dev *pci_dev,
         sprintf(dev->name, "saa%x[%d]", pci_dev->device, dev->nr);
 
 #ifdef CONFIG_MEDIA_CONTROLLER
-        dev->media_dev = media_device_pci_init(pci_dev, dev->name);
+        dev->media_dev = kzalloc(sizeof(*dev->media_dev), GFP_KERNEL);
         if (!dev->media_dev) {
                 err = -ENOMEM;
                 goto fail0;
         }
+        media_device_pci_init(dev->media_dev, pci_dev, dev->name);
         dev->v4l2_dev.mdev = dev->media_dev;
 #endif