From eaa96b354e6c5e064c5a958726d23c62cf21d11c Mon Sep 17 00:00:00 2001 From: Jeff Kirsher Date: Fri, 14 Nov 2008 06:45:07 +0000 Subject: [PATCH] --- yaml --- r: 119095 b: refs/heads/master c: e82f54ba030b429c06b5240cbe7eeaaa03a8db11 h: refs/heads/master i: 119093: 3c48a8da107148d6ed5b0705ff1fb83367d27937 119091: 82c8de26e244c9b12999b5af1d98075a943682e0 119087: 5560e2cb9982dfdcf05c319f4850e99654aec923 v: v3 --- [refs] | 2 +- trunk/drivers/net/e1000e/netdev.c | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) 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: