diff options
author | Dan Carpenter <error27@gmail.com> | 2011-06-09 03:09:34 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2011-06-10 14:57:53 -0400 |
commit | 5b49b35a671e59c16c33611ea2d5650438388663 (patch) | |
tree | d2d856567bfd58b9ac86651c586ded1731ef981d | |
parent | 287546df342daaa146c840ce26b3ed012a055de5 (diff) |
b43: check for allocation failures
Add some error handling if the allocation fails.
Signed-off-by: Dan Carpenter <error27@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
-rw-r--r-- | drivers/net/wireless/b43/bus.c | 6 | ||||
-rw-r--r-- | drivers/net/wireless/b43/main.c | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/drivers/net/wireless/b43/bus.c b/drivers/net/wireless/b43/bus.c index 6c63aecd6ab..8a10b82f8ea 100644 --- a/drivers/net/wireless/b43/bus.c +++ b/drivers/net/wireless/b43/bus.c | |||
@@ -83,7 +83,11 @@ void b43_bus_ssb_block_write(struct b43_bus_dev *dev, const void *buffer, | |||
83 | 83 | ||
84 | struct b43_bus_dev *b43_bus_dev_ssb_init(struct ssb_device *sdev) | 84 | struct b43_bus_dev *b43_bus_dev_ssb_init(struct ssb_device *sdev) |
85 | { | 85 | { |
86 | struct b43_bus_dev *dev = kzalloc(sizeof(*dev), GFP_KERNEL); | 86 | struct b43_bus_dev *dev; |
87 | |||
88 | dev = kzalloc(sizeof(*dev), GFP_KERNEL); | ||
89 | if (!dev) | ||
90 | return NULL; | ||
87 | 91 | ||
88 | dev->bus_type = B43_BUS_SSB; | 92 | dev->bus_type = B43_BUS_SSB; |
89 | dev->sdev = sdev; | 93 | dev->sdev = sdev; |
diff --git a/drivers/net/wireless/b43/main.c b/drivers/net/wireless/b43/main.c index 1d8d98324d1..7aed9a0eabc 100644 --- a/drivers/net/wireless/b43/main.c +++ b/drivers/net/wireless/b43/main.c | |||
@@ -5025,6 +5025,8 @@ int b43_ssb_probe(struct ssb_device *sdev, const struct ssb_device_id *id) | |||
5025 | int first = 0; | 5025 | int first = 0; |
5026 | 5026 | ||
5027 | dev = b43_bus_dev_ssb_init(sdev); | 5027 | dev = b43_bus_dev_ssb_init(sdev); |
5028 | if (!dev) | ||
5029 | return -ENOMEM; | ||
5028 | 5030 | ||
5029 | wl = ssb_get_devtypedata(sdev); | 5031 | wl = ssb_get_devtypedata(sdev); |
5030 | if (!wl) { | 5032 | if (!wl) { |