Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cd1177f2 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -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)