Staging: vme: bridges: Add missing unlocks
authorJulia Lawall <julia@diku.dk>
Wed, 26 May 2010 15:59:11 +0000 (17:59 +0200)
committerGreg Kroah-Hartman <gregkh@suse.de>
Fri, 18 Jun 2010 22:16:21 +0000 (15:16 -0700)
Add a spin_unlock and mutex_unlock missing on the error path.

The semantic match that finds this problem is as follows:
(http://coccinelle.lip6.fr/)

// <smpl>
@@
expression E1;
@@

* spin_lock(E1,...);
  <+... when != E1
  if (...) {
    ... when != E1
*   return ...;
  }
  ...+>
* spin_unlock(E1,...);
// </smpl>

Signed-off-by: Julia Lawall <julia@diku.dk>
Signed-off-by: Martyn Welch <martyn.welch@ge.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
drivers/staging/vme/bridges/vme_ca91cx42.c

index 0f9ea58ff71705bb10823b83158ad99ae996c1d9..16cf53e38a744dec8239a5bf1fbb89455d2708d6 100644 (file)
@@ -900,7 +900,8 @@ unsigned int ca91cx42_master_rmw(struct vme_master_resource *image,
        /* Address must be 4-byte aligned */
        if (pci_addr & 0x3) {
                dev_err(dev, "RMW Address not 4-byte aligned\n");
-               return -EINVAL;
+               result = -EINVAL;
+               goto out;
        }
 
        /* Ensure RMW Disabled whilst configuring */
@@ -921,6 +922,7 @@ unsigned int ca91cx42_master_rmw(struct vme_master_resource *image,
        /* Disable RMW */
        iowrite32(0, bridge->base + SCYC_CTL);
 
+out:
        spin_unlock(&(image->lock));
 
        mutex_unlock(&(bridge->vme_rmw));