diff options
author | Stefan Richter <stefanr@s5r6.in-berlin.de> | 2006-07-03 16:02:32 (GMT) |
---|---|---|
committer | Ben Collins <bcollins@ubuntu.com> | 2006-07-03 16:02:32 (GMT) |
commit | 438bd525e5240a48233cd3290f7fe66ff0167e20 (patch) | |
tree | 5559a543c9ff18290b29fded7e20522308fea5dc /drivers/ieee1394/dv1394-private.h | |
parent | d8831d5554c2f295a6746e9d3b4cbd8bb13a540f (diff) | |
download | linux-438bd525e5240a48233cd3290f7fe66ff0167e20.tar.xz |
[PATCH] ieee1394: dv1394: sem2mutex conversion
Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de> (not runtime-tested)
Signed-off-by: Ben Collins <bcollins@ubuntu.com>
Diffstat (limited to 'drivers/ieee1394/dv1394-private.h')
-rw-r--r-- | drivers/ieee1394/dv1394-private.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/ieee1394/dv1394-private.h b/drivers/ieee1394/dv1394-private.h index 80b5ac7..7d1d284 100644 --- a/drivers/ieee1394/dv1394-private.h +++ b/drivers/ieee1394/dv1394-private.h @@ -460,7 +460,7 @@ struct video_card { int dma_running; /* - 3) the sleeping semaphore 'sem' - this is used from process context only, + 3) the sleeping mutex 'mtx' - this is used from process context only, to serialize various operations on the video_card. Even though only one open() is allowed, we still need to prevent multiple threads of execution from entering calls like read, write, ioctl, etc. @@ -468,9 +468,9 @@ struct video_card { I honestly can't think of a good reason to use dv1394 from several threads at once, but we need to serialize anyway to prevent oopses =). - NOTE: if you need both spinlock and sem, take sem first to avoid deadlock! + NOTE: if you need both spinlock and mtx, take mtx first to avoid deadlock! */ - struct semaphore sem; + struct mutex mtx; /* people waiting for buffer space, please form a line here... */ wait_queue_head_t waitq; |