From 07871a297e4ba94b9ecc82ad0ab588f190039f18 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <zajec5@gmail.com>
Date: Thu, 4 Feb 2010 13:11:54 +0100
Subject: [PATCH] --- yaml --- r: 184073 b: refs/heads/master c:
 40bd5203ddb6b946b55c35d1c26dfe9ec1b232f5 h: refs/heads/master i:   184071:
 d165297dc8435c6522b56d1e1e0a0666b759a28f v: v3

---
 [refs]                                 | 2 +-
 trunk/drivers/net/wireless/b43/phy_n.c | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index c714b5aaa40b..0ca93cf70ae0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5f6393ecf5cc7d064ba9172e0a2e1c64bcaaaf2f
+refs/heads/master: 40bd5203ddb6b946b55c35d1c26dfe9ec1b232f5
diff --git a/trunk/drivers/net/wireless/b43/phy_n.c b/trunk/drivers/net/wireless/b43/phy_n.c
index 074b34c3b383..795bb1e3345d 100644
--- a/trunk/drivers/net/wireless/b43/phy_n.c
+++ b/trunk/drivers/net/wireless/b43/phy_n.c
@@ -1069,6 +1069,10 @@ static u16 b43_nphy_gen_load_samples(struct b43_wldev *dev, u32 freq, u16 max,
 	}
 
 	samples = kzalloc(len * sizeof(struct b43_c32), GFP_KERNEL);
+	if (!samples) {
+		b43err(dev->wl, "allocation for samples generation failed\n");
+		return 0;
+	}
 	rot = (((freq * 36) / bw) << 16) / 100;
 	angle = 0;