Commit 405ddbfa authored by Mauro Carvalho Chehab's avatar Mauro Carvalho Chehab

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

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 182dde7c ("[media] media: au0828 change
to use Managed Media Controller API")
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@osg.samsung.com>
parent c89178f5
...@@ -144,6 +144,7 @@ static void au0828_unregister_media_device(struct au0828_dev *dev) ...@@ -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, ...@@ -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;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment