Skip to content

Commit

Permalink
hwmon: (s3c-hwmon) Use a real mutex
Browse files Browse the repository at this point in the history
The semaphore which protects the ADC is semantically a mutex. Use a
real mutex.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Cc: Ben Dooks <ben-linux@fluff.org>
Signed-off-by: Jean Delvare <khali@linux-fr.org>
  • Loading branch information
Thomas Gleixner authored and Jean Delvare committed Oct 28, 2010
1 parent caaa0f3 commit 9c627e3
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions drivers/hwmon/s3c-hwmon.c
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ struct s3c_hwmon_attr {
* @attr: The holders for the channel attributes.
*/
struct s3c_hwmon {
struct semaphore lock;
struct mutex lock;
struct s3c_adc_client *client;
struct device *hwmon_dev;

Expand All @@ -73,14 +73,14 @@ static int s3c_hwmon_read_ch(struct device *dev,
{
int ret;

ret = down_interruptible(&hwmon->lock);
ret = mutex_lock_interruptible(&hwmon->lock);
if (ret < 0)
return ret;

dev_dbg(dev, "reading channel %d\n", channel);

ret = s3c_adc_read(hwmon->client, channel);
up(&hwmon->lock);
mutex_unlock(&hwmon->lock);

return ret;
}
Expand Down Expand Up @@ -296,7 +296,7 @@ static int __devinit s3c_hwmon_probe(struct platform_device *dev)

platform_set_drvdata(dev, hwmon);

init_MUTEX(&hwmon->lock);
mutex_init(&hwmon->lock);

/* Register with the core ADC driver. */

Expand Down

0 comments on commit 9c627e3

Please sign in to comment.