summaryrefslogtreecommitdiffstats
path: root/arch/powerpc/kernel/vio.c
diff options
context:
space:
mode:
authorJulia Lawall <julia@diku.dk>2010-03-29 05:33:34 +0000
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>2010-04-07 18:00:43 +1000
commitf6d8c8bb1d360272d795927d39f3d2c5934e77d9 (patch)
treeda15e76aa8e9135fed852f26a7d0161a73c7f202 /arch/powerpc/kernel/vio.c
parent43caa61f154da85a620965f3f61c2f45366d8dc7 (diff)
downloadblackbird-op-linux-f6d8c8bb1d360272d795927d39f3d2c5934e77d9.tar.gz
blackbird-op-linux-f6d8c8bb1d360272d795927d39f3d2c5934e77d9.zip
powerpc/vio: Add missing unlock in error path
Add an unlock before exiting the function. A simplified version of the semantic patch that finds this problem is as follows: (http://coccinelle.lip6.fr/) // <smpl> @r exists@ expression E1; identifier f; @@ f (...) { <+... * spin_lock_irq (E1,...); ... when != E1 * return ...; ...+> } // </smpl> Signed-off-by: Julia Lawall <julia@diku.dk> Acked-by: Stephen Rothwell <sfr@canb.auug.org.au> Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Diffstat (limited to 'arch/powerpc/kernel/vio.c')
-rw-r--r--arch/powerpc/kernel/vio.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/powerpc/kernel/vio.c b/arch/powerpc/kernel/vio.c
index 2f57956714bd..2a3428bef83a 100644
--- a/arch/powerpc/kernel/vio.c
+++ b/arch/powerpc/kernel/vio.c
@@ -645,8 +645,10 @@ void vio_cmo_set_dev_desired(struct vio_dev *viodev, size_t desired)
found = 1;
break;
}
- if (!found)
+ if (!found) {
+ spin_unlock_irqrestore(&vio_cmo.lock, flags);
return;
+ }
/* Increase/decrease in desired device entitlement */
if (desired >= viodev->cmo.desired) {
OpenPOWER on IntegriCloud