summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2013-11-15 14:29:53 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2013-11-15 14:29:53 -0800
commitcd1177f25069cb494680eedd718e7c6d8fd85d10 (patch)
treefe40c12c2d69213522d1c3b207dcb5edea431369 /drivers
parent6c0514ddd973ff13c3d2b2e7ac1422c982afb8eb (diff)
parenta3483353ca4e6dbeef2ed62ebed01af109b5b27a (diff)
downloadop-kernel-dev-cd1177f25069cb494680eedd718e7c6d8fd85d10.zip
op-kernel-dev-cd1177f25069cb494680eedd718e7c6d8fd85d10.tar.gz
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()
Diffstat (limited to 'drivers')
-rw-r--r--drivers/gpu/drm/drm_stub.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/drm_stub.c b/drivers/gpu/drm/drm_stub.c
index c200136..f53d524 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)
OpenPOWER on IntegriCloud