diff --git a/[refs] b/[refs]
index e622b0531e63..a02f3cc3a77f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d069a46be8ac745c193f2acc6071d9042b347224
+refs/heads/master: 292121dce2af63dab371102097a887de7cf24233
diff --git a/trunk/drivers/net/wireless/ath/ath9k/pci.c b/trunk/drivers/net/wireless/ath/ath9k/pci.c
index 8bd8e85ece42..d704c8d9bae7 100644
--- a/trunk/drivers/net/wireless/ath/ath9k/pci.c
+++ b/trunk/drivers/net/wireless/ath/ath9k/pci.c
@@ -126,7 +126,7 @@ static void ath_pci_aspm_init(struct ath_common *common)
 		 * Both upstream and downstream PCIe components should
 		 * have the same ASPM settings.
 		 */
-		if (WARN_ON(!parent))
+		if (!parent)
 			return;
 
 		pos = pci_pcie_cap(parent);
@@ -137,7 +137,7 @@ static void ath_pci_aspm_init(struct ath_common *common)
 		return;
 	}
 
-	if (WARN_ON(!parent))
+	if (!parent)
 		return;
 
 	pos = pci_pcie_cap(parent);