aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/libertas
diff options
context:
space:
mode:
authorJoe Perches <joe@perches.com>2012-01-29 07:56:23 -0500
committerDavid S. Miller <davem@davemloft.net>2012-01-31 16:20:21 -0500
commite404decb0fb017be80552adee894b35307b6c7b4 (patch)
tree19b2324328eb1f8cef599f9f164dc9ca6e5699c9 /drivers/net/wireless/libertas
parent5f3d9cb2962967d9d7e03abb4a7ca275a9a3fea5 (diff)
drivers/net: Remove unnecessary k.alloc/v.alloc OOM messages
alloc failures use dump_stack so emitting an additional out-of-memory message is an unnecessary duplication. Remove the allocation failure messages. Signed-off-by: Joe Perches <joe@perches.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/wireless/libertas')
-rw-r--r--drivers/net/wireless/libertas/if_cs.c5
-rw-r--r--drivers/net/wireless/libertas/if_usb.c4
2 files changed, 3 insertions, 6 deletions
diff --git a/drivers/net/wireless/libertas/if_cs.c b/drivers/net/wireless/libertas/if_cs.c
index 3f7bf4d912b6..234ee88dec95 100644
--- a/drivers/net/wireless/libertas/if_cs.c
+++ b/drivers/net/wireless/libertas/if_cs.c
@@ -815,10 +815,9 @@ static int if_cs_probe(struct pcmcia_device *p_dev)
815 lbs_deb_enter(LBS_DEB_CS); 815 lbs_deb_enter(LBS_DEB_CS);
816 816
817 card = kzalloc(sizeof(struct if_cs_card), GFP_KERNEL); 817 card = kzalloc(sizeof(struct if_cs_card), GFP_KERNEL);
818 if (!card) { 818 if (!card)
819 pr_err("error in kzalloc\n");
820 goto out; 819 goto out;
821 } 820
822 card->p_dev = p_dev; 821 card->p_dev = p_dev;
823 p_dev->priv = card; 822 p_dev->priv = card;
824 823
diff --git a/drivers/net/wireless/libertas/if_usb.c b/drivers/net/wireless/libertas/if_usb.c
index b5fbbc7947df..74da5f1ea243 100644
--- a/drivers/net/wireless/libertas/if_usb.c
+++ b/drivers/net/wireless/libertas/if_usb.c
@@ -261,10 +261,8 @@ static int if_usb_probe(struct usb_interface *intf,
261 udev = interface_to_usbdev(intf); 261 udev = interface_to_usbdev(intf);
262 262
263 cardp = kzalloc(sizeof(struct if_usb_card), GFP_KERNEL); 263 cardp = kzalloc(sizeof(struct if_usb_card), GFP_KERNEL);
264 if (!cardp) { 264 if (!cardp)
265 pr_err("Out of memory allocating private data\n");
266 goto error; 265 goto error;
267 }
268 266
269 setup_timer(&cardp->fw_timeout, if_usb_fw_timeo, (unsigned long)cardp); 267 setup_timer(&cardp->fw_timeout, if_usb_fw_timeo, (unsigned long)cardp);
270 init_waitqueue_head(&cardp->fw_wq); 268 init_waitqueue_head(&cardp->fw_wq);