[PATCH] fix for uninitialized timer in drm_drv.h

From: Martin Josefsson (gandalf@wlug.westbo.se)
Date: Sat Feb 15 2003 - 17:31:01 EST

Hi,

Here's a fix for an uninitialized timer in drm_drv.h, for some reason it
initilizes the timer when the device is opened, not at init.
It moves the initilization for the waitqueue to init aswell.

I'm not sure these changes are 100% correct since the drm code is a
mess. I've been running the patch here without any problems for a while.

--- linux-2.5.58/drivers/char/drm/drm_drv.h.orig 2003-01-16 20:39:47.000000000 +0100
+++ linux-2.5.58/drivers/char/drm/drm_drv.h 2003-01-16 20:49:22.000000000 +0100
@@ -323,8 +323,6 @@
         dev->last_context = 0;
         dev->last_switch = 0;
         dev->last_checked = 0;
- init_timer( &dev->timer );
- init_waitqueue_head( &dev->context_wait );
 
         dev->ctx_start = 0;
         dev->lck_start = 0;
@@ -580,6 +578,8 @@
                 memset( (void *)dev, 0, sizeof(*dev) );
                 dev->count_lock = SPIN_LOCK_UNLOCKED;
                 sema_init( &dev->struct_sem, 1 );
+ init_timer( &dev->timer );
+ init_waitqueue_head( &dev->context_wait );
 
                 if ((DRM(minor)[i] = DRM(stub_register)(DRIVER_NAME, &DRM(fops),dev)) < 0)
                         return -EPERM; 

-- 
/Martin

Never argue with an idiot. They drag you down to their level, then beat you with experience.
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

This archive was generated by hypermail 2b29 : Sat Feb 15 2003 - 22:01:05 EST