diff options
author | Binoy Jayan <binoy.jayan@linaro.org> | 2017-06-13 04:58:50 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@s-opensource.com> | 2017-06-24 15:42:34 -0400 |
commit | bd7a85d36363268266c5039bd31495d047acfb98 (patch) | |
tree | 53e91cb8eb3cedb08a3f118620d7e2751d240b24 /drivers/media/pci/ngene/ngene-i2c.c | |
parent | 90979f045513e7d3d7fb390dc26117ce95a31804 (diff) |
media: ngene: Replace semaphore i2c_switch_mutex with mutex
The semaphore 'i2c_switch_mutex' is used as a simple mutex, so
it should be written as one. Semaphores are going away in the future.
Signed-off-by: Binoy Jayan <binoy.jayan@linaro.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
Diffstat (limited to 'drivers/media/pci/ngene/ngene-i2c.c')
-rw-r--r-- | drivers/media/pci/ngene/ngene-i2c.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/media/pci/ngene/ngene-i2c.c b/drivers/media/pci/ngene/ngene-i2c.c index cf39fcf54adf..fbf36353c701 100644 --- 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, | |||
118 | (struct ngene_channel *)i2c_get_adapdata(adapter); | 118 | (struct ngene_channel *)i2c_get_adapdata(adapter); |
119 | struct ngene *dev = chan->dev; | 119 | struct ngene *dev = chan->dev; |
120 | 120 | ||
121 | down(&dev->i2c_switch_mutex); | 121 | mutex_lock(&dev->i2c_switch_mutex); |
122 | ngene_i2c_set_bus(dev, chan->number); | 122 | ngene_i2c_set_bus(dev, chan->number); |
123 | 123 | ||
124 | if (num == 2 && msg[1].flags & I2C_M_RD && !(msg[0].flags & I2C_M_RD)) | 124 | 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, | |||
136 | msg[0].buf, msg[0].len, 0)) | 136 | msg[0].buf, msg[0].len, 0)) |
137 | goto done; | 137 | goto done; |
138 | 138 | ||
139 | up(&dev->i2c_switch_mutex); | 139 | mutex_unlock(&dev->i2c_switch_mutex); |
140 | return -EIO; | 140 | return -EIO; |
141 | 141 | ||
142 | done: | 142 | done: |
143 | up(&dev->i2c_switch_mutex); | 143 | mutex_unlock(&dev->i2c_switch_mutex); |
144 | return num; | 144 | return num; |
145 | } | 145 | } |
146 | 146 | ||