1 files changed, 18 insertions, 1 deletions

diff --git a/drivers/net/wireless/iwlwifi/iwl-agn.c b/drivers/net/wireless/iwlwifi/iwl-agn.c
index 5da6b35cd26d..36bafeb353ce 100644
--- a/drivers/net/wireless/iwlwifi/iwl-agn.c
+++ b/drivers/net/wireless/iwlwifi/iwl-agn.c
@@ -1719,6 +1719,10 @@ static int iwl_read_ucode(struct iwl_priv *priv)
         priv->ucode_data_backup.len = data_size;
         iwl_alloc_fw_desc(priv->pci_dev, &priv->ucode_data_backup);
 
+        if (!priv->ucode_code.v_addr || !priv->ucode_data.v_addr ||
+            !priv->ucode_data_backup.v_addr)
+                goto err_pci_alloc;
+
         /* Initialization instructions and data */
         if (init_size && init_data_size) {
                 priv->ucode_init.len = init_size;
@@ -2482,7 +2486,7 @@ static int iwl_mac_tx(struct ieee80211_hw *hw, struct sk_buff *skb)
                 dev_kfree_skb_any(skb);
 
         IWL_DEBUG_MACDUMP("leave\n");
-        return 0;
+        return NETDEV_TX_OK;
 }
 
 static int iwl_mac_add_interface(struct ieee80211_hw *hw,
@@ -4038,6 +4042,19 @@ static int iwl_pci_suspend(struct pci_dev *pdev, pm_message_t state)
                 priv->is_open = 1;
         }
 
+        /* pci driver assumes state will be saved in this function.
+         * pci state is saved and device disabled when interface is
+         * stopped, so at this time pci device will always be disabled -
+         * whether interface was started or not. saving pci state now will
+         * cause saved state be that of a disabled device, which will cause
+         * problems during resume in that we will end up with a disabled device.
+         *
+         * indicate that the current saved state (from when interface was
+         * stopped) is valid. if interface was never up at time of suspend
+         * then the saved state will still be valid as it was saved during
+         * .probe. */
+        pdev->state_saved = true;
+
         pci_set_power_state(pdev, PCI_D3hot);
 
         return 0;