diff options
| author | Joe Perches <joe@perches.com> | 2012-01-29 14:47:52 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-01-31 22:20:48 +0100 |
| commit | 41de8d4cff21a2e81e3d9ff66f5f7c903f9c3ab1 (patch) | |
| tree | c441a6911ff802233473f31fa29a985e690a816a /drivers/net/wireless/atmel.c | |
| parent | drivers/net: Remove unnecessary k.alloc/v.alloc OOM messages (diff) | |
| download | linux-41de8d4cff21a2e81e3d9ff66f5f7c903f9c3ab1.tar.xz linux-41de8d4cff21a2e81e3d9ff66f5f7c903f9c3ab1.zip | |
drivers/net: Remove alloc_etherdev error messages
alloc_etherdev has a generic OOM/unable to alloc message.
Remove the duplicative messages after alloc_etherdev calls.
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/wireless/atmel.c')
| -rw-r--r-- | drivers/net/wireless/atmel.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/net/wireless/atmel.c b/drivers/net/wireless/atmel.c index 7e45ca2e78ef..3010cee7b95a 100644 --- a/drivers/net/wireless/atmel.c +++ b/drivers/net/wireless/atmel.c @@ -1533,10 +1533,9 @@ struct net_device *init_atmel_card(unsigned short irq, unsigned long port, /* Create the network device object. */ dev = alloc_etherdev(sizeof(*priv)); - if (!dev) { - printk(KERN_ERR "atmel: Couldn't alloc_etherdev\n"); + if (!dev) return NULL; - } + if (dev_alloc_name(dev, dev->name) < 0) { printk(KERN_ERR "atmel: Couldn't get name!\n"); goto err_out_free; |