From 23586d7580363071f271da7ca51a83760718240d Mon Sep 17 00:00:00 2001 From: Thomas Gleixner Date: Thu, 28 Oct 2010 20:31:44 +0200 Subject: [PATCH] --- yaml --- r: 220469 b: refs/heads/master c: 9c627e3be3e8f36eda73ed9e8aa4763582841c1f h: refs/heads/master i: 220467: d1b3e035f6ead42eb42f6b73a21011864270bfd3 v: v3 --- [refs] | 2 +- trunk/drivers/hwmon/s3c-hwmon.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index ca90ba2f4b8d..09d812de1fa8 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: caaa0f36c378c6fec6fd5260a63566e002ac4a84 +refs/heads/master: 9c627e3be3e8f36eda73ed9e8aa4763582841c1f diff --git a/trunk/drivers/hwmon/s3c-hwmon.c b/trunk/drivers/hwmon/s3c-hwmon.c index 3f3f9a47acfd..05248f2d7581 100644 --- a/trunk/drivers/hwmon/s3c-hwmon.c +++ b/trunk/drivers/hwmon/s3c-hwmon.c @@ -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; @@ -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; } @@ -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. */