]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
vfc_dev conversion to mutex: fallout
authorAl Viro <viro@ftp.linux.org.uk>
Sat, 20 Oct 2007 20:47:53 +0000 (21:47 +0100)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Sat, 20 Oct 2007 22:04:06 +0000 (15:04 -0700)
Commit 7b96dc023a1b487bce59256fde14b8bb28b45aea ("[SPARC] Videopix Frame
Grabber: Convert device_lock_sem to mutex") missed one place.

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
drivers/sbus/char/vfc_dev.c

index e7a1642b2aa4c528baa0aa4f1bf85f6f970fe6ce..d4f8fcded51d8615e1da7cd5996ac715b0defd9e 100644 (file)
@@ -134,7 +134,7 @@ int init_vfc_hw(struct vfc_dev *dev)
 int init_vfc_devstruct(struct vfc_dev *dev, int instance) 
 {
        dev->instance=instance;
-       init_MUTEX(&dev->device_lock_sem);
+       mutex_init(&dev->device_lock_mtx);
        dev->control_reg=0;
        dev->busy=0;
        return 0;