From 056f735f10cdc5d1cb0726de4c1709e5d8ad6491 Mon Sep 17 00:00:00 2001 From: Bruce Allan Date: Tue, 31 Jan 2012 06:37:22 +0000 Subject: [PATCH] --- yaml --- r: 290027 b: refs/heads/master c: 24b706b2f4bb28c34d32f9d333d8a118215a38cc h: refs/heads/master i: 290025: a210a00c761818ac66f60351d943dd548f8162b4 290023: a8dbc26ef85d6c615a2fe4a6a4d43e3fee756c29 v: v3 --- [refs] | 2 +- trunk/drivers/net/ethernet/intel/e1000e/netdev.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 76a185fb0410..7c0b55c3c59f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f23efdff77bbc1207255ccebe04771970604bbd9 +refs/heads/master: 24b706b2f4bb28c34d32f9d333d8a118215a38cc diff --git a/trunk/drivers/net/ethernet/intel/e1000e/netdev.c b/trunk/drivers/net/ethernet/intel/e1000e/netdev.c index c05137f362a1..02efae08ce3b 100644 --- a/trunk/drivers/net/ethernet/intel/e1000e/netdev.c +++ b/trunk/drivers/net/ethernet/intel/e1000e/netdev.c @@ -3756,8 +3756,9 @@ static int e1000_test_msi_interrupt(struct e1000_adapter *adapter) if (adapter->flags & FLAG_MSI_TEST_FAILED) { adapter->int_mode = E1000E_INT_MODE_LEGACY; e_info("MSI interrupt test failed, using legacy interrupt.\n"); - } else + } else { e_dbg("MSI interrupt test succeeded!\n"); + } free_irq(adapter->pdev->irq, netdev); pci_disable_msi(adapter->pdev);