Merge tag 'char-misc-4.13-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/gregk...

[karo-tx-linux.git] / drivers / media / pci / ngene / ngene-core.c

diff --git a/drivers/media/pci/ngene/ngene-core.c b/drivers/media/pci/ngene/ngene-core.c
index ce69e648b663a934f5ace1c834e8c0b1642d044a..8c92cb7f7e72f7af8ca6411ec60db81c8b95bbaa 100644 (file)
--- a/drivers/media/pci/ngene/ngene-core.c
+++ b/drivers/media/pci/ngene/ngene-core.c
@@ -336,9 +336,9 @@ int ngene_command(struct ngene *dev, struct ngene_command *com)
 {
        int result;
 
-       down(&dev->cmd_mutex);
+       mutex_lock(&dev->cmd_mutex);
        result = ngene_command_mutex(dev, com);
-       up(&dev->cmd_mutex);
+       mutex_unlock(&dev->cmd_mutex);
        return result;
 }
 
@@ -560,7 +560,6 @@ static int ngene_command_stream_control(struct ngene *dev, u8 stream,
        u16 BsSPI = ((stream & 1) ? 0x9800 : 0x9700);
        u16 BsSDO = 0x9B00;
 
-       down(&dev->stream_mutex);
        memset(&com, 0, sizeof(com));
        com.cmd.hdr.Opcode = CMD_CONTROL;
        com.cmd.hdr.Length = sizeof(struct FW_STREAM_CONTROL) - 2;
@@ -586,17 +585,13 @@ static int ngene_command_stream_control(struct ngene *dev, u8 stream,
                        chan->State = KSSTATE_ACQUIRE;
                        chan->HWState = HWSTATE_STOP;
                        spin_unlock_irq(&chan->state_lock);
-                       if (ngene_command(dev, &com) < 0) {
-                               up(&dev->stream_mutex);
+                       if (ngene_command(dev, &com) < 0)
                                return -1;
-                       }
                        /* clear_buffers(chan); */
                        flush_buffers(chan);
-                       up(&dev->stream_mutex);
                        return 0;
                }
                spin_unlock_irq(&chan->state_lock);
-               up(&dev->stream_mutex);
                return 0;
        }
 
@@ -692,11 +687,9 @@ static int ngene_command_stream_control(struct ngene *dev, u8 stream,
                chan->HWState = HWSTATE_STARTUP;
        spin_unlock_irq(&chan->state_lock);
 
-       if (ngene_command(dev, &com) < 0) {
-               up(&dev->stream_mutex);
+       if (ngene_command(dev, &com) < 0)
                return -1;
-       }
-       up(&dev->stream_mutex);
+
        return 0;
 }
 
@@ -750,8 +743,11 @@ void set_transfer(struct ngene_channel *chan, int state)
                /* else printk(KERN_INFO DEVICE_NAME ": lock=%08x\n",
                           ngreadl(0x9310)); */
 
+       mutex_lock(&dev->stream_mutex);
        ret = ngene_command_stream_control(dev, chan->number,
                                           control, mode, flags);
+       mutex_unlock(&dev->stream_mutex);
+
        if (!ret)
                chan->running = state;
        else
@@ -1283,7 +1279,7 @@ static int ngene_load_firm(struct ngene *dev)
 
 static void ngene_stop(struct ngene *dev)
 {
-       down(&dev->cmd_mutex);
+       mutex_destroy(&dev->cmd_mutex);
        i2c_del_adapter(&(dev->channel[0].i2c_adapter));
        i2c_del_adapter(&(dev->channel[1].i2c_adapter));
        ngwritel(0, NGENE_INT_ENABLE);
@@ -1346,10 +1342,10 @@ static int ngene_start(struct ngene *dev)
        init_waitqueue_head(&dev->cmd_wq);
        init_waitqueue_head(&dev->tx_wq);
        init_waitqueue_head(&dev->rx_wq);
-       sema_init(&dev->cmd_mutex, 1);
-       sema_init(&dev->stream_mutex, 1);
+       mutex_init(&dev->cmd_mutex);
+       mutex_init(&dev->stream_mutex);
        sema_init(&dev->pll_mutex, 1);
-       sema_init(&dev->i2c_switch_mutex, 1);
+       mutex_init(&dev->i2c_switch_mutex);
        spin_lock_init(&dev->cmd_lock);
        for (i = 0; i < MAX_STREAM; i++)
                spin_lock_init(&dev->channel[i].state_lock);
@@ -1606,10 +1602,10 @@ static void ngene_unlink(struct ngene *dev)
        com.in_len = 3;
        com.out_len = 1;
 
-       down(&dev->cmd_mutex);
+       mutex_lock(&dev->cmd_mutex);
        ngwritel(0, NGENE_INT_ENABLE);
        ngene_command_mutex(dev, &com);
-       up(&dev->cmd_mutex);
+       mutex_unlock(&dev->cmd_mutex);
 }
 
 void ngene_shutdown(struct pci_dev *pdev)