diff options
| author |   Joe Perches <joe@perches.com> | 2013-02-07 11:46:27 +0000 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2013-02-08 17:44:39 -0500 |
| commit | 14f8dc49532f765968ff37c3b99edbeb99004ace (patch) | |
| tree | a0c2f42ca545b3587a071ad05427c7351c8244e0 /drivers/net/usb/pegasus.c | |
| parent | bgmac: fix "cmdcfg" calls for promisc and loopback modes (diff) | |
| download | linux-dev-14f8dc49532f765968ff37c3b99edbeb99004ace.tar.xz linux-dev-14f8dc49532f765968ff37c3b99edbeb99004ace.zip | |
drivers: net: Remove remaining alloc/OOM messages
alloc failures already get standardized OOM
messages and a dump_stack.
For the affected mallocs around these OOM messages:
Converted kmallocs with multiplies to kmalloc_array.
Converted a kmalloc/memcpy to kmemdup.
Removed now unused stack variables.
Removed unnecessary parentheses.
Neatened alignment.
Signed-off-by: Joe Perches <joe@perches.com>
Acked-by: Arend van Spriel <arend@broadcom.com>
Acked-by: Marc Kleine-Budde <mkl@pengutronix.de>
Acked-by: John W. Linville <linville@tuxdriver.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/usb/pegasus.c')
| -rw-r--r-- | drivers/net/usb/pegasus.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/net/usb/pegasus.c b/drivers/net/usb/pegasus.c index 8ee5ab0db127..73051d10ead2 100644 --- a/drivers/net/usb/pegasus.c +++ b/drivers/net/usb/pegasus.c @@ -149,11 +149,9 @@ static int get_registers(pegasus_t *pegasus, __u16 indx, __u16 size, DECLARE_WAITQUEUE(wait, current); buffer = kmalloc(size, GFP_KERNEL); - if (!buffer) { - netif_warn(pegasus, drv, pegasus->net, - "out of memory in %s\n", __func__); + if (!buffer) return -ENOMEM; - } + add_wait_queue(&pegasus->ctrl_wait, &wait); set_current_state(TASK_UNINTERRUPTIBLE); while (pegasus->flags & ETH_REGS_CHANGED) |