diff options
| author |   Rob Clark <rob@ti.com> | 2012-04-05 10:34:56 -0500 |
|---|---|---|
| committer |   Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-04-10 09:19:29 -0700 |
| commit | be0775ac140dd80a1d60fb7e71ec60e649c14ff8 (patch) | |
| tree | 257a0152dcd0e21057eec159dd9c223aebedc510 /drivers/staging | |
| parent | staging: zsmalloc: fix memory leak (diff) | |
| download | linux-dev-be0775ac140dd80a1d60fb7e71ec60e649c14ff8.tar.xz linux-dev-be0775ac140dd80a1d60fb7e71ec60e649c14ff8.zip | |
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>
Diffstat (limited to 'drivers/staging')
| -rw-r--r-- | drivers/staging/omapdrm/omap_drv.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/staging/omapdrm/omap_drv.c b/drivers/staging/omapdrm/omap_drv.c index 3df5b4c58ecd..620b8d54223d 100644 --- a/drivers/staging/omapdrm/omap_drv.c +++ b/drivers/staging/omapdrm/omap_drv.c @@ -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); } |