mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-10-30 08:02:30 +00:00
Code Issues Releases Wiki Activity

[media] Revert "[media] media: au0828 change to use Managed Media Controller API"

Browse source 
Extending the lifetime of the media_device struct is not handled well
by the core, as it will erase some data from the struct, when
media_device_cleanup() is called after unregistering it.

While we have a fixup patch for it already, the usage of those new
functions are needed only when we share data with other drivers.

So, better to revert the changes.

This reverts commit 182dde7c5d ("[media] media: au0828 change
to use Managed Media Controller API")

Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
This commit is contained in:
Mauro Carvalho Chehab 2016-03-31 10:54:05 -03:00
parent c89178f57a
commit 405ddbfa68
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
drivers/media/usb/au0828/au0828-core.c
View file

@ -144,6 +144,7 @@ static void au0828_unregister_media_device(struct au0828_dev *dev)
media_device_unregister(dev->media_dev); media_device_unregister(dev->media_dev);
media_device_cleanup(dev->media_dev); media_device_cleanup(dev->media_dev);
kfree(dev->media_dev);
dev->media_dev = NULL; dev->media_dev = NULL;
} }
#endif #endif
@ -197,7 +198,7 @@ static int au0828_media_device_init(struct au0828_dev *dev,
#ifdef CONFIG_MEDIA_CONTROLLER #ifdef CONFIG_MEDIA_CONTROLLER
struct media_device *mdev; struct media_device *mdev;
mdev = media_device_get_devres(&udev->dev); mdev = kzalloc(sizeof(*mdev), GFP_KERNEL);
if (!mdev) if (!mdev)
return -ENOMEM; return -ENOMEM;