Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 8f0cdddcd3f270901765fc909c3aee37a2091e78

Authored by Julia Lawall
Committed by Jesse Barnes
1 parent f382a086f3
Exists in smarc-l5.0.0_1.0.0-ga and in 5 other branches imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga

PCI: drivers/pci/hotplug/ibmphp_ebda.c: add missing iounmap 

Add missing iounmap in error handling code, in a case where the function
already preforms iounmap on some other execution path.

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

// <smpl>
@@
expression e;
statement S,S1;
int ret;
@@
e = \(ioremap\|ioremap_nocache\)(...)
... when != iounmap(e)
if (<+...e...+>) S
... when any
    when != iounmap(e)
*if (...)
   { ... when != iounmap(e)
     return ...; }
... when any
iounmap(e);
// </smpl>

Signed-off-by: Julia Lawall <Julia.Lawall@lip6.fr>
Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>

Showing 1 changed file with 4 additions and 2 deletions Side-by-side Diff

drivers/pci/hotplug/ibmphp_ebda.c
Diff comments   View file @ 8f0cddd
... ... @@ -368,8 +368,10 @@
368 368 debug ("rio blk id: %x\n", blk_id);
369 369  
370 370 rio_table_ptr = kzalloc(sizeof(struct rio_table_hdr), GFP_KERNEL);
371   - if (!rio_table_ptr)
372   - return -ENOMEM;
  371 + if (!rio_table_ptr) {
  372 + rc = -ENOMEM;
  373 + goto out;
  374 + }
373 375 rio_table_ptr->ver_num = readb (io_mem + offset);
374 376 rio_table_ptr->scal_count = readb (io_mem + offset + 1);
375 377 rio_table_ptr->riodev_count = readb (io_mem + offset + 2);