]> git.hungrycats.org Git - linux/commitdiff
igbvf: add missing iounmap() on error in igbvf_probe()
authorWei Yongjun <yongjun_wei@trendmicro.com.cn>
Tue, 24 Sep 2013 05:18:45 +0000 (05:18 +0000)
committerJiri Slaby <jslaby@suse.cz>
Tue, 26 Aug 2014 12:12:18 +0000 (14:12 +0200)
commit de524681f88ff4ed293aa239f83c8cb04d59b47d upstream.

Add the missing iounmap() before return from igbvf_probe()
in the error handling case.

Signed-off-by: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
Tested-by: Aaron Brown <aaron.f.brown@intel.com>
Tested-by: Sibai Li <Sibai.li@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
drivers/net/ethernet/intel/igbvf/netdev.c

index 0c0b8f6855a25fe5db93115b1868f3b6d3b63ad3..04bf22e5ee315ffb9c9c789a7dad585e02063ca1 100644 (file)
@@ -2692,7 +2692,7 @@ static int igbvf_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
        if (ei->get_variants) {
                err = ei->get_variants(adapter);
                if (err)
-                       goto err_ioremap;
+                       goto err_get_variants;
        }
 
        /* setup adapter struct */
@@ -2789,6 +2789,7 @@ err_hw_init:
        kfree(adapter->rx_ring);
 err_sw_init:
        igbvf_reset_interrupt_capability(adapter);
+err_get_variants:
        iounmap(adapter->hw.hw_addr);
 err_ioremap:
        free_netdev(netdev);