Merge tag 'kvm-s390-next-4.14-2' of git://git.kernel.org/pub/scm/linux/kernel/git...

[sfrench/cifs-2.6.git] / drivers / media / pci / ngene / ngene-i2c.c

diff --git a/drivers/media/pci/ngene/ngene-i2c.c b/drivers/media/pci/ngene/ngene-i2c.c
index cf39fcf54adfb812ca691caa68e09ddcbb434947..fbf36353c7014b9f3424a850585b82d147177e3a 100644 (file)
--- a/drivers/media/pci/ngene/ngene-i2c.c
+++ b/drivers/media/pci/ngene/ngene-i2c.c
@@ -118,7 +118,7 @@ static int ngene_i2c_master_xfer(struct i2c_adapter *adapter,
                (struct ngene_channel *)i2c_get_adapdata(adapter);
        struct ngene *dev = chan->dev;
 
-       down(&dev->i2c_switch_mutex);
+       mutex_lock(&dev->i2c_switch_mutex);
        ngene_i2c_set_bus(dev, chan->number);
 
        if (num == 2 && msg[1].flags & I2C_M_RD && !(msg[0].flags & I2C_M_RD))
@@ -136,11 +136,11 @@ static int ngene_i2c_master_xfer(struct i2c_adapter *adapter,
                                            msg[0].buf, msg[0].len, 0))
                        goto done;
 
-       up(&dev->i2c_switch_mutex);
+       mutex_unlock(&dev->i2c_switch_mutex);
        return -EIO;
 
 done:
-       up(&dev->i2c_switch_mutex);
+       mutex_unlock(&dev->i2c_switch_mutex);
        return num;
 }