On Wed, Dec 18, 2013 at 7:53 AM, Daniel Vetter <daniel.vetter@xxxxxxxx> wrote: > Dave accidentally merged the wrong version of the patch in > > commit fd3c02531461924853db65f2664db361b53a70d3 > Author: Daniel Vetter <daniel.vetter@xxxxxxxx> > Date: Wed Dec 11 11:34:26 2013 +0100 > > drm/omap: call drm_put_dev directly in ->remove > > which did not include the fix from Rob's review: omapdrm is split into > the drm driver and the dmm driver (yeah, I've complained about that > almost-impossible-to-spot difference, too). We need to unregister the > dmm driver in the pdev_remove hook. > > Cc: Dave Airlie <airlied@xxxxxxxxxx> > Cc: Rob Clark <robdclark@xxxxxxxxx> > Signed-off-by: Daniel Vetter <daniel.vetter@xxxxxxxx> thanks, Signed-off-by: Rob Clark <robdclark@xxxxxxxxx> > --- > drivers/gpu/drm/omapdrm/omap_drv.c | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/drivers/gpu/drm/omapdrm/omap_drv.c b/drivers/gpu/drm/omapdrm/omap_drv.c > index 13f294aeaefd..ed3ebb3c2a69 100644 > --- a/drivers/gpu/drm/omapdrm/omap_drv.c > +++ b/drivers/gpu/drm/omapdrm/omap_drv.c > @@ -668,6 +668,8 @@ static int pdev_remove(struct platform_device *device) > > drm_put_dev(platform_get_drvdata(device)); > > + platform_driver_unregister(&omap_dmm_driver); > + > return 0; > } > > -- > 1.8.4.3 > _______________________________________________ dri-devel mailing list dri-devel@xxxxxxxxxxxxxxxxxxxxx http://lists.freedesktop.org/mailman/listinfo/dri-devel