From 84ad7de53491c037582f2417cac697cacc592607 Mon Sep 17 00:00:00 2001 From: Rob Clark Date: Thu, 5 Apr 2012 10:34:56 -0500 Subject: [PATCH] --- yaml --- r: 299105 b: refs/heads/master c: be0775ac140dd80a1d60fb7e71ec60e649c14ff8 h: refs/heads/master i: 299103: 60e18ed579c1ba5fd1a213ed0df30894bb9e7253 v: v3 --- [refs] | 2 +- trunk/drivers/staging/omapdrm/omap_drv.c | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 79aec68b3c54..babf196a6cac 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f4477e90b3ea4c40466e8f418cf41a17aef09192 +refs/heads/master: be0775ac140dd80a1d60fb7e71ec60e649c14ff8 diff --git a/trunk/drivers/staging/omapdrm/omap_drv.c b/trunk/drivers/staging/omapdrm/omap_drv.c index 3df5b4c58ecd..620b8d54223d 100644 --- a/trunk/drivers/staging/omapdrm/omap_drv.c +++ b/trunk/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); }