---

yaml --- r: 119095 b: refs/heads/master c: e82f54b h: refs/heads/master i: 119093: 3c48a8d 119091: 82c8de2 119087: 5560e2c v: v3
git-mirror · Nov 17, 2008 · eaa96b3 · eaa96b3
1 parent 7452ddd
commit eaa96b3
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git 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
@@ -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: