git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge master.kernel.org:/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog
[pandora-kernel.git]
/
drivers
/
char
/
drm
/
via_dmablit.c
diff --git
a/drivers/char/drm/via_dmablit.c
b/drivers/char/drm/via_dmablit.c
index
b7f1745
..
78a81a4
100644
(file)
--- a/
drivers/char/drm/via_dmablit.c
+++ b/
drivers/char/drm/via_dmablit.c
@@
-557,7
+557,7
@@
via_init_dmablit(drm_device_t *dev)
blitq->num_outstanding = 0;
blitq->is_active = 0;
blitq->aborting = 0;
-
blitq->blit_lock = SPIN_LOCK_UNLOCKED
;
+
spin_lock_init(&blitq->blit_lock)
;
for (j=0; j<VIA_NUM_BLIT_SLOTS; ++j) {
DRM_INIT_WAITQUEUE(blitq->blit_queue + j);
}