From: Jesse Barnes <jbarnes@virtuousgeek.org>
Date: Fri, 4 Dec 2009 23:18:01 +0000 (-0800)
Subject: PCI: ibmphp_hpc: don't release hw sem twice if kthread stops
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=5c788a695ab5740413d9f9c0035d0d7aeef1c708;p=deliverable%2Flinux.git

PCI: ibmphp_hpc: don't release hw sem twice if kthread stops

If we stop the kthread, we may end up up'ing the sem twice, which seems
unintended.

Reported-by: Dan Carpenter <error27@gmail.com>
Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
---

diff --git a/drivers/pci/hotplug/ibmphp_hpc.c b/drivers/pci/hotplug/ibmphp_hpc.c
index 83f337c891a9..c7084f0eca5a 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);