From e86005334d59e9e41d53afd56d1750d7ca7fe339 Mon Sep 17 00:00:00 2001 From: "David S. Miller" Date: Sun, 22 Jul 2012 12:36:41 -0700 Subject: [PATCH] --- yaml --- r: 315779 b: refs/heads/master c: d47e12d63e745f667a977226c3f59ae14521592d h: refs/heads/master i: 315777: d3c3386574306d856ee509429dfa22576a86ee03 315775: c209776d604d9555fe32aee6fee64df673f328bc v: v3 --- [refs] | 2 +- trunk/drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index e211fdbaf10d..7edd735690c1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7491302dc765d33cbec121d5ffc0a3c040cbe444 +refs/heads/master: d47e12d63e745f667a977226c3f59ae14521592d diff --git a/trunk/drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.c b/trunk/drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.c index 47b2ce740ec1..4fea8716ab64 100644 --- a/trunk/drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.c +++ b/trunk/drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.c @@ -236,7 +236,7 @@ void ixgbe_disable_sriov(struct ixgbe_adapter *adapter) if (ixgbe_vfs_are_assigned(adapter)) { e_dev_warn("Unloading driver while VFs are assigned - VFs will not be deallocated\n"); return; - + } /* disable iov and allow time for transactions to clear */ pci_disable_sriov(adapter->pdev); #endif