---

yaml
---
r: 328173
b: refs/heads/master
c: 7439046
h: refs/heads/master
i:
  328171: 792d056
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 358a46d47eefadd5be67495682426bd743ce455c
+refs/heads/master: 7439046d9747966bb805ca8bfd1086a876a4b8fd

trunk/drivers/net/wireless/iwlwifi/pcie/rx.c

@@ -203,6 +203,17 @@ static void iwl_rx_queue_restock(struct iwl_trans *trans)
 	struct iwl_rx_mem_buffer *rxb;
 	unsigned long flags;
 
+	/*
+	 * If the device isn't enabled - not need to try to add buffers...
+	 * This can happen when we stop the device and still have an interrupt
+	 * pending. We stop the APM before we sync the interrupts / tasklets
+	 * because we have to (see comment there). On the other hand, since
+	 * the APM is stopped, we cannot access the HW (in particular not prph).
+	 * So don't try to restock if the APM has been already stopped.
+	 */
+	if (!test_bit(STATUS_DEVICE_ENABLED, &trans_pcie->status))
+		return;
+
 	spin_lock_irqsave(&rxq->lock, flags);
 	while ((iwl_rx_queue_space(rxq) > 0) && (rxq->free_count)) {
 		/* The overwritten rxb must be a used one */