aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorAl Viro <viro@ftp.linux.org.uk>2007-10-20 16:47:53 -0400
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-10-20 18:04:06 -0400
commit8add24413dff675855bcef8806175d11631917d0 (patch)
tree53c532d570b81aba59cdee41ec1e9bd55067962b /drivers
parente91a810e884850781a1cada2ea81b8016881d244 (diff)
vfc_dev conversion to mutex: fallout
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>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/sbus/char/vfc_dev.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/sbus/char/vfc_dev.c b/drivers/sbus/char/vfc_dev.c
index e7a1642b2aa4..d4f8fcded51d 100644
--- a/drivers/sbus/char/vfc_dev.c
+++ b/drivers/sbus/char/vfc_dev.c
@@ -134,7 +134,7 @@ int init_vfc_hw(struct vfc_dev *dev)
134int init_vfc_devstruct(struct vfc_dev *dev, int instance) 134int init_vfc_devstruct(struct vfc_dev *dev, int instance)
135{ 135{
136 dev->instance=instance; 136 dev->instance=instance;
137 init_MUTEX(&dev->device_lock_sem); 137 mutex_init(&dev->device_lock_mtx);
138 dev->control_reg=0; 138 dev->control_reg=0;
139 dev->busy=0; 139 dev->busy=0;
140 return 0; 140 return 0;