mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-29 23:53:32 +00:00
staging: drm/omap: move where DMM driver is registered
Not sure what triggered the change in behavior, but seems to result in recursively acquiring a mutex and hanging on boot. But omap_drm_init() seems a much more sane place to register the driver for the DMM sub-device. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
f4477e90b3
commit
be0775ac14
1 changed files with 4 additions and 3 deletions
|
@ -803,9 +803,6 @@ static void pdev_shutdown(struct platform_device *device)
|
|||
static int pdev_probe(struct platform_device *device)
|
||||
{
|
||||
DBG("%s", device->name);
|
||||
if (platform_driver_register(&omap_dmm_driver))
|
||||
dev_err(&device->dev, "DMM registration failed\n");
|
||||
|
||||
return drm_platform_init(&omap_drm_driver, device);
|
||||
}
|
||||
|
||||
|
@ -833,6 +830,10 @@ struct platform_driver pdev = {
|
|||
static int __init omap_drm_init(void)
|
||||
{
|
||||
DBG("init");
|
||||
if (platform_driver_register(&omap_dmm_driver)) {
|
||||
/* we can continue on without DMM.. so not fatal */
|
||||
dev_err(NULL, "DMM registration failed\n");
|
||||
}
|
||||
return platform_driver_register(&pdev);
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue