b43: avoid unregistering device objects during suspend

[linux-2.6-omap-h63xx.git] / drivers / ieee1394 / dv1394-private.h

diff --git a/drivers/ieee1394/dv1394-private.h b/drivers/ieee1394/dv1394-private.h
index 80b5ac7fe38341d547d0dd3f912af21dc7594c32..7d1d2845b42065a64c696b5fb19f8e0a3770275b 100644 (file)
--- 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;