diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2013-11-15 14:29:53 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-11-15 14:29:53 -0800 |
| commit | cd1177f25069cb494680eedd718e7c6d8fd85d10 (patch) | |
| tree | fe40c12c2d69213522d1c3b207dcb5edea431369 | |
| parent | Merge tag 'blackfin-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/realmz6/blackfin-linux (diff) | |
| parent | drm: check for !kdev in drm_unplug_minor() (diff) | |
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()
| -rw-r--r-- | drivers/gpu/drm/drm_stub.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/drm_stub.c b/drivers/gpu/drm/drm_stub.c index c200136a5d8e..f53d5246979c 100644 --- 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) |