Commit f7483240 authored by Andrew Morton's avatar Andrew Morton Committed by Linus Torvalds

[PATCH] fix for uninitialized timer in drm_drv.h

Patch from Martin Josefsson <gandalf@wlug.westbo.se>

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.
parent 9a4529ff
...@@ -323,8 +323,6 @@ static int DRM(setup)( drm_device_t *dev ) ...@@ -323,8 +323,6 @@ static int DRM(setup)( drm_device_t *dev )
dev->last_context = 0; dev->last_context = 0;
dev->last_switch = 0; dev->last_switch = 0;
dev->last_checked = 0; dev->last_checked = 0;
init_timer( &dev->timer );
init_waitqueue_head( &dev->context_wait );
dev->ctx_start = 0; dev->ctx_start = 0;
dev->lck_start = 0; dev->lck_start = 0;
...@@ -580,6 +578,8 @@ static int __init drm_init( void ) ...@@ -580,6 +578,8 @@ static int __init drm_init( void )
memset( (void *)dev, 0, sizeof(*dev) ); memset( (void *)dev, 0, sizeof(*dev) );
dev->count_lock = SPIN_LOCK_UNLOCKED; dev->count_lock = SPIN_LOCK_UNLOCKED;
sema_init( &dev->struct_sem, 1 ); 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) if ((DRM(minor)[i] = DRM(stub_register)(DRIVER_NAME, &DRM(fops),dev)) < 0)
return -EPERM; return -EPERM;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment