From 2e479284ba8a20a47705977a2622ed14a4ec4a0c Mon Sep 17 00:00:00 2001
From: Dan Carpenter <error27@gmail.com>
Date: Thu, 9 Jun 2011 10:09:34 +0300
Subject: [PATCH] --- yaml --- r: 255739 b: refs/heads/master c:
 5b49b35a671e59c16c33611ea2d5650438388663 h: refs/heads/master i:   255737:
 f2441e9188a98b93d5fee127e4c65146ae4b5891   255735:
 01c1e415ad1420453ba48e83feba6c5a8fba9fec v: v3

---
 [refs]                                | 2 +-
 trunk/drivers/net/wireless/b43/bus.c  | 6 +++++-
 trunk/drivers/net/wireless/b43/main.c | 2 ++
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 8b8a8911e040..1332709cc6e4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 287546df342daaa146c840ce26b3ed012a055de5
+refs/heads/master: 5b49b35a671e59c16c33611ea2d5650438388663
diff --git a/trunk/drivers/net/wireless/b43/bus.c b/trunk/drivers/net/wireless/b43/bus.c
index 6c63aecd6ab4..8a10b82f8ea7 100644
--- a/trunk/drivers/net/wireless/b43/bus.c
+++ b/trunk/drivers/net/wireless/b43/bus.c
@@ -83,7 +83,11 @@ void b43_bus_ssb_block_write(struct b43_bus_dev *dev, const void *buffer,
 
 struct b43_bus_dev *b43_bus_dev_ssb_init(struct ssb_device *sdev)
 {
-	struct b43_bus_dev *dev = kzalloc(sizeof(*dev), GFP_KERNEL);
+	struct b43_bus_dev *dev;
+
+	dev = kzalloc(sizeof(*dev), GFP_KERNEL);
+	if (!dev)
+		return NULL;
 
 	dev->bus_type = B43_BUS_SSB;
 	dev->sdev = sdev;
diff --git a/trunk/drivers/net/wireless/b43/main.c b/trunk/drivers/net/wireless/b43/main.c
index 1d8d98324d15..7aed9a0eabc4 100644
--- a/trunk/drivers/net/wireless/b43/main.c
+++ b/trunk/drivers/net/wireless/b43/main.c
@@ -5025,6 +5025,8 @@ int b43_ssb_probe(struct ssb_device *sdev, const struct ssb_device_id *id)
 	int first = 0;
 
 	dev = b43_bus_dev_ssb_init(sdev);
+	if (!dev)
+		return -ENOMEM;
 
 	wl = ssb_get_devtypedata(sdev);
 	if (!wl) {