Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux

Pull drm regression fix from Dave Airlie:
 "Forgot this one liner was necessary to fix module reload issues
  introduced earlier in the drm pull"

* 'drm-next' of git://people.freedesktop.org/~airlied/linux:
  drm: check for !kdev in drm_unplug_minor()

diff --git a/drivers/gpu/drm/drm_stub.c b/drivers/gpu/drm/drm_stub.c
index c200136a5d8e34dc7e53e98d693cafdae7b118ff..f53d5246979c386ed632b21c08decb3ab1296f9e 100644 (file)
--- a/drivers/gpu/drm/drm_stub.c
+++ b/drivers/gpu/drm/drm_stub.c
@@ -338,7 +338,7 @@ err_idr:
  */
 static void drm_unplug_minor(struct drm_minor *minor)
 {
-       if (!minor || !device_is_registered(minor->kdev))
+       if (!minor || !minor->kdev)
                return;
 
 #if defined(CONFIG_DEBUG_FS)