diff options
Diffstat (limited to 'drivers/net/wireless/ipw2x00')
-rw-r--r-- | drivers/net/wireless/ipw2x00/ipw2100.c | 5 | ||||
-rw-r--r-- | drivers/net/wireless/ipw2x00/libipw_module.c | 5 |
2 files changed, 3 insertions, 7 deletions
diff --git a/drivers/net/wireless/ipw2x00/ipw2100.c b/drivers/net/wireless/ipw2x00/ipw2100.c index ddf340f914d..f0551f807f6 100644 --- a/drivers/net/wireless/ipw2x00/ipw2100.c +++ b/drivers/net/wireless/ipw2x00/ipw2100.c | |||
@@ -3455,11 +3455,8 @@ static int ipw2100_msg_allocate(struct ipw2100_priv *priv) | |||
3455 | priv->msg_buffers = | 3455 | priv->msg_buffers = |
3456 | kmalloc(IPW_COMMAND_POOL_SIZE * sizeof(struct ipw2100_tx_packet), | 3456 | kmalloc(IPW_COMMAND_POOL_SIZE * sizeof(struct ipw2100_tx_packet), |
3457 | GFP_KERNEL); | 3457 | GFP_KERNEL); |
3458 | if (!priv->msg_buffers) { | 3458 | if (!priv->msg_buffers) |
3459 | printk(KERN_ERR DRV_NAME ": %s: PCI alloc failed for msg " | ||
3460 | "buffers.\n", priv->net_dev->name); | ||
3461 | return -ENOMEM; | 3459 | return -ENOMEM; |
3462 | } | ||
3463 | 3460 | ||
3464 | for (i = 0; i < IPW_COMMAND_POOL_SIZE; i++) { | 3461 | for (i = 0; i < IPW_COMMAND_POOL_SIZE; i++) { |
3465 | v = pci_alloc_consistent(priv->pci_dev, | 3462 | v = pci_alloc_consistent(priv->pci_dev, |
diff --git a/drivers/net/wireless/ipw2x00/libipw_module.c b/drivers/net/wireless/ipw2x00/libipw_module.c index d5ef696298e..3adb24021a2 100644 --- a/drivers/net/wireless/ipw2x00/libipw_module.c +++ b/drivers/net/wireless/ipw2x00/libipw_module.c | |||
@@ -150,10 +150,9 @@ struct net_device *alloc_libipw(int sizeof_priv, int monitor) | |||
150 | LIBIPW_DEBUG_INFO("Initializing...\n"); | 150 | LIBIPW_DEBUG_INFO("Initializing...\n"); |
151 | 151 | ||
152 | dev = alloc_etherdev(sizeof(struct libipw_device) + sizeof_priv); | 152 | dev = alloc_etherdev(sizeof(struct libipw_device) + sizeof_priv); |
153 | if (!dev) { | 153 | if (!dev) |
154 | LIBIPW_ERROR("Unable to allocate network device.\n"); | ||
155 | goto failed; | 154 | goto failed; |
156 | } | 155 | |
157 | ieee = netdev_priv(dev); | 156 | ieee = netdev_priv(dev); |
158 | 157 | ||
159 | ieee->dev = dev; | 158 | ieee->dev = dev; |