Merge tag 'linux-kselftest-4.13-rc6-fixes' of git://git.kernel.org/pub/scm/linux...

[mirror_ubuntu-artful-kernel.git] / drivers / media / pci / ngene / ngene.h

diff --git a/drivers/media/pci/ngene/ngene.h b/drivers/media/pci/ngene/ngene.h
index 10d8f74c4f0a50a4f282b0211b8bb0b616919d5a..7c7cd217333d8af262e802081fb775ea4db2f7b4 100644 (file)
--- a/drivers/media/pci/ngene/ngene.h
+++ b/drivers/media/pci/ngene/ngene.h
@@ -762,10 +762,10 @@ struct ngene {
 
        wait_queue_head_t     cmd_wq;
        int                   cmd_done;
-       struct semaphore      cmd_mutex;
-       struct semaphore      stream_mutex;
+       struct mutex          cmd_mutex;
+       struct mutex          stream_mutex;
        struct semaphore      pll_mutex;
-       struct semaphore      i2c_switch_mutex;
+       struct mutex          i2c_switch_mutex;
        int                   i2c_current_channel;
        int                   i2c_current_bus;
        spinlock_t            cmd_lock;