diff --git a/[refs] b/[refs] index 66c060947a8f..59067cc51a2b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3ee82383f0098a2e13acc8cf1be8e47512f41e5a +refs/heads/master: e82f54ba030b429c06b5240cbe7eeaaa03a8db11 diff --git a/trunk/drivers/net/e1000e/netdev.c b/trunk/drivers/net/e1000e/netdev.c index 2c8dffdc889f..f6ebebb8cfa5 100644 --- a/trunk/drivers/net/e1000e/netdev.c +++ b/trunk/drivers/net/e1000e/netdev.c @@ -5009,6 +5009,7 @@ static int __devinit e1000_probe(struct pci_dev *pdev, err_sw_init: if (adapter->hw.flash_address) iounmap(adapter->hw.flash_address); + e1000e_reset_interrupt_capability(adapter); err_flashmap: iounmap(adapter->hw.hw_addr); err_ioremap: