diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-12-13 16:35:09 +0000 | 
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-12-13 16:35:09 +0000 | 
| commit | bc7ecbcbc2c0ff235382077b55de7896775afc16 (patch) | |
| tree | 9918b2f3fdeebd9c99a308af94d86bc13c80d0c8 /drivers/pci/hotplug/ibmphp_hpc.c | |
| parent | c52854018ad123c9ef83867462457b75bb56d452 (diff) | |
| parent | 285eae0a4ba0f467341476fd4c6981e5cdafc6be (diff) | |
Merge branch 'devel' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6 into devel
Diffstat (limited to 'drivers/pci/hotplug/ibmphp_hpc.c')
| -rw-r--r-- | drivers/pci/hotplug/ibmphp_hpc.c | 3 | 
1 files changed, 2 insertions, 1 deletions
| diff --git a/drivers/pci/hotplug/ibmphp_hpc.c b/drivers/pci/hotplug/ibmphp_hpc.c index 83f337c891a..c7084f0eca5 100644 --- a/drivers/pci/hotplug/ibmphp_hpc.c +++ b/drivers/pci/hotplug/ibmphp_hpc.c @@ -890,7 +890,7 @@ static int poll_hpc(void *data)  			msleep(POLL_INTERVAL_SEC * 1000);  			if (kthread_should_stop()) -				break; +				goto out_sleep;  			down (&semOperations); @@ -904,6 +904,7 @@ static int poll_hpc(void *data)  		/* give up the hardware semaphore */  		up (&semOperations);  		/* sleep for a short time just for good measure */ +out_sleep:  		msleep(100);  	}  	up (&sem_exit); | 
