]> git.baikalelectronics.ru Git - kernel.git/commit
[SCSI] ipr: reorder error handling code to include iounmap
authorJulia Lawall <julia@diku.dk>
Mon, 11 Jul 2011 21:08:25 +0000 (14:08 -0700)
committerJames Bottomley <JBottomley@Parallels.com>
Wed, 27 Jul 2011 13:45:08 +0000 (17:45 +0400)
commitbef472ab8326314bacb496b66688cbfa84dc4acd
tree1a6c2a6374e0463401a6219961c5b348c55f9d70
parentb0906f3b991b3bb3290376dbc621cad7eae560e1
[SCSI] ipr: reorder error handling code to include iounmap

The out_msi_disable label should be before cleanup_nomem to additionally
benefit from the call to iounmap.  Subsequent gotos are adjusted to go to
out_msi_disable instead of cleanup_nomem, which now follows it.  This is
safe because pci_disable_msi does nothing if pci_enable_msi was not called.

A simplified version of the semantic match that finds this problem is as
follows: (http://coccinelle.lip6.fr/)

// <smpl>
@r@
expression e1,e2;
statement S;
@@

e1 = pci_ioremap_bar(...);
... when != e1 = e2
    when != iounmap(e1)
    when any
(
 if (<+...e1...+>) S
|
 if(...) { ... return 0; }
|
 if (...) { ... when != iounmap(e1)
                when != if (...) { ... iounmap(e1) ... }
* return ...;
 } else S
)
// </smpl>

Signed-off-by: Julia Lawall <julia@diku.dk>
Acked-by: Brian King <brking@linux.vnet.ibm.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: James Bottomley <JBottomley@Parallels.com>
drivers/scsi/ipr.c