Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6:
  PM / Runtime: Add runtime PM statistics (v3)
  PM / Runtime: Make runtime_status attribute not debug-only (v. 2)
  PM: Do not use dynamically allocated objects in pm_wakeup_event()
  PM / Suspend: Fix ordering of calls in suspend error paths
  PM / Hibernate: Fix snapshot error code path
  PM / Hibernate: Fix hibernation_platform_enter()
  pm_qos: Get rid of the allocation in pm_qos_add_request()
  pm_qos: Reimplement using plists
  plist: Add plist_last
  PM: Make it possible to avoid races between wakeup and system sleep
  PNPACPI: Add support for remote wakeup
  PM: describe kernel policy regarding wakeup defaults (v. 2)
  PM / Hibernate: Fix typos in comments in kernel/power/swap.c

1 files changed, 7 insertions, 10 deletions

diff --git a/drivers/net/e1000e/netdev.c b/drivers/net/e1000e/netdev.c
index 57a7e41da69e..9f13b660b801 100644
--- a/drivers/net/e1000e/netdev.c
+++ b/drivers/net/e1000e/netdev.c
@@ -2901,10 +2901,10 @@ static void e1000_configure_rx(struct e1000_adapter *adapter)
                          * dropped transactions.
                          */
                         pm_qos_update_request(
-                                adapter->netdev->pm_qos_req, 55);
+                                &adapter->netdev->pm_qos_req, 55);
                 } else {
                         pm_qos_update_request(
-                                adapter->netdev->pm_qos_req,
+                                &adapter->netdev->pm_qos_req,
                                 PM_QOS_DEFAULT_VALUE);
                 }
         }
@@ -3196,9 +3196,9 @@ int e1000e_up(struct e1000_adapter *adapter)
 
         /* DMA latency requirement to workaround early-receive/jumbo issue */
         if (adapter->flags & FLAG_HAS_ERT)
-                adapter->netdev->pm_qos_req =
-                        pm_qos_add_request(PM_QOS_CPU_DMA_LATENCY,
-                                       PM_QOS_DEFAULT_VALUE);
+                pm_qos_add_request(&adapter->netdev->pm_qos_req,
+                                   PM_QOS_CPU_DMA_LATENCY,
+                                   PM_QOS_DEFAULT_VALUE);
 
         /* hardware has been reset, we need to reload some things */
         e1000_configure(adapter);
@@ -3263,11 +3263,8 @@ void e1000e_down(struct e1000_adapter *adapter)
         e1000_clean_tx_ring(adapter);
         e1000_clean_rx_ring(adapter);
 
-        if (adapter->flags & FLAG_HAS_ERT) {
-                pm_qos_remove_request(
-                              adapter->netdev->pm_qos_req);
-                adapter->netdev->pm_qos_req = NULL;
-        }
+        if (adapter->flags & FLAG_HAS_ERT)
+                pm_qos_remove_request(&adapter->netdev->pm_qos_req);
 
         /*
          * TODO: for power management, we could drop the link and