drm/i915: don't use i915_driver_unload() to cleanup failed vblank init

Commit Message

Jeremy Kerr Nov. 17, 2010, 6:24 a.m. UTC

None

Patch

diff --git a/drivers/gpu/drm/i915/i915_dma.c b/drivers/gpu/drm/i915/i915_dma.c
index 7a26f4d..80766b6 100644
--- a/drivers/gpu/drm/i915/i915_dma.c
+++ b/drivers/gpu/drm/i915/i915_dma.c
@@ -2043,8 +2043,8 @@  int i915_driver_load(struct drm_device *dev, unsigned long flags)
 	ret = drm_vblank_init(dev, I915_NUM_PIPE);
 
 	if (ret) {
-		(void) i915_driver_unload(dev);
-		return ret;
+		DRM_ERROR("failed to init vblank\n");
+		goto out_workqueue_free;
 	}
 
 	/* Start out suspended */