Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

macintosh/therm_windtunnel: Convert semaphore to mutex

Browse source 
Signed-off-by: Daniel Walker <dwalker@mvista.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Acked-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Paul Mackerras <paulus@samba.org>
This commit is contained in:
Daniel Walker 2008-06-10 09:26:08 +10:00 committed by Paul Mackerras
parent b1e2270ffe
commit 1baaeea005
1 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
drivers/macintosh/therm_windtunnel.c
View file

@ -62,7 +62,7 @@ static struct {
volatile int running;
struct task_struct *poll_task;
struct semaphore lock;
struct mutex lock;
struct of_device *of_dev;
struct i2c_client *thermostat;
@ -286,23 +286,23 @@ restore_regs( void )
static int control_loop(void *dummy)
{
down(&x.lock);
mutex_lock(&x.lock);
setup_hardware();
up(&x.lock);
mutex_unlock(&x.lock);
for (;;) {
msleep_interruptible(8000);
if (kthread_should_stop())
break;
down(&x.lock);
mutex_lock(&x.lock);
poll_temp();
up(&x.lock);
mutex_unlock(&x.lock);
}
down(&x.lock);
mutex_lock(&x.lock);
restore_regs();
up(&x.lock);
mutex_unlock(&x.lock);
return 0;
}
@ -489,7 +489,7 @@ g4fan_init( void )
const struct apple_thermal_info *info;
struct device_node *np;
init_MUTEX( &x.lock );
mutex_init(&x.lock);
if( !(np=of_find_node_by_name(NULL, "power-mgt")) )
return -ENODEV;