Commit cd1177f2 authored by Linus Torvalds's avatar Linus Torvalds

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()
parents 6c0514dd a3483353
...@@ -338,7 +338,7 @@ static int drm_get_minor(struct drm_device *dev, struct drm_minor **minor, ...@@ -338,7 +338,7 @@ static int drm_get_minor(struct drm_device *dev, struct drm_minor **minor,
*/ */
static void drm_unplug_minor(struct drm_minor *minor) static void drm_unplug_minor(struct drm_minor *minor)
{ {
if (!minor || !device_is_registered(minor->kdev)) if (!minor || !minor->kdev)
return; return;
#if defined(CONFIG_DEBUG_FS) #if defined(CONFIG_DEBUG_FS)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment