Merge branch 'drm-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6 (186837ca) · Commits · e / devices / android_kernel_xiaomi_markw

drivers/gpu/drm/drm_stub.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -516,8 +516,6 @@ void drm_put_dev(struct drm_device *dev)
		}
		driver = dev->driver;

		drm_vblank_cleanup(dev);

		drm_lastclose(dev);

		if (drm_core_has_MTRR(dev) && drm_core_has_AGP(dev) &&
		@@ -537,6 +535,8 @@ void drm_put_dev(struct drm_device *dev)
		dev->agp = NULL;
		}

		drm_vblank_cleanup(dev);

		list_for_each_entry_safe(r_list, list_temp, &dev->maplist, head)
		drm_rmmap(dev, r_list->map);
		drm_ht_remove(&dev->map_hash);