diff options
| author | Mauro Carvalho Chehab <mchehab@osg.samsung.com> | 2016-02-22 18:10:49 +0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@osg.samsung.com> | 2016-02-23 13:19:39 +0300 |
| commit | 6cf5dad17e913fce1ccb0c38e199eff15b0f03cc (patch) | |
| tree | b039fae16d8290e8d54e4e614a1a0fb3dfd7e34a /drivers/media/usb/dvb-usb/dvb-usb-dvb.c | |
| parent | 41b44e35ba9b34e50a65c05ecf7642c07bd3e8aa (diff) | |
| download | linux-6cf5dad17e913fce1ccb0c38e199eff15b0f03cc.tar.xz | |
[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>
Diffstat (limited to 'drivers/media/usb/dvb-usb/dvb-usb-dvb.c')
| -rw-r--r-- | drivers/media/usb/dvb-usb/dvb-usb-dvb.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/media/usb/dvb-usb/dvb-usb-dvb.c b/drivers/media/usb/dvb-usb/dvb-usb-dvb.c index 7509408b0b8e..6477b04e95c7 100644 --- a/drivers/media/usb/dvb-usb/dvb-usb-dvb.c +++ b/drivers/media/usb/dvb-usb/dvb-usb-dvb.c @@ -103,7 +103,11 @@ static int dvb_usb_media_device_init(struct dvb_usb_adapter *adap) struct dvb_usb_device *d = adap->dev; struct usb_device *udev = d->udev; - mdev = media_device_usb_init(udev, d->desc->name); + mdev = kzalloc(sizeof(*mdev), GFP_KERNEL); + if (!mdev) + return -ENOMEM; + + media_device_usb_init(mdev, udev, d->desc->name); dvb_register_media_controller(&adap->dvb_adap, mdev); |