Skip to content

Commit

Permalink
Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux
Browse files Browse the repository at this point in the history
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()
  • Loading branch information
Linus Torvalds committed Nov 15, 2013
2 parents 6c0514d + a348335 commit cd1177f
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion drivers/gpu/drm/drm_stub.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
{
if (!minor || !device_is_registered(minor->kdev))
if (!minor || !minor->kdev)
return;

#if defined(CONFIG_DEBUG_FS)
Expand Down

0 comments on commit cd1177f

Please sign in to comment.