aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/hippi/rrunner.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/hippi/rrunner.c')
-rw-r--r--drivers/net/hippi/rrunner.c8
1 files changed, 1 insertions, 7 deletions
diff --git a/drivers/net/hippi/rrunner.c b/drivers/net/hippi/rrunner.c
index e68c941926f..2a51363d9fe 100644
--- a/drivers/net/hippi/rrunner.c
+++ b/drivers/net/hippi/rrunner.c
@@ -1600,12 +1600,8 @@ static int rr_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
1600 } 1600 }
1601 1601
1602 image = kmalloc(EEPROM_WORDS * sizeof(u32), GFP_KERNEL); 1602 image = kmalloc(EEPROM_WORDS * sizeof(u32), GFP_KERNEL);
1603 if (!image){ 1603 if (!image)
1604 printk(KERN_ERR "%s: Unable to allocate memory "
1605 "for EEPROM image\n", dev->name);
1606 return -ENOMEM; 1604 return -ENOMEM;
1607 }
1608
1609 1605
1610 if (rrpriv->fw_running){ 1606 if (rrpriv->fw_running){
1611 printk("%s: Firmware already running\n", dev->name); 1607 printk("%s: Firmware already running\n", dev->name);
@@ -1637,8 +1633,6 @@ static int rr_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
1637 image = kmalloc(EEPROM_WORDS * sizeof(u32), GFP_KERNEL); 1633 image = kmalloc(EEPROM_WORDS * sizeof(u32), GFP_KERNEL);
1638 oldimage = kmalloc(EEPROM_WORDS * sizeof(u32), GFP_KERNEL); 1634 oldimage = kmalloc(EEPROM_WORDS * sizeof(u32), GFP_KERNEL);
1639 if (!image || !oldimage) { 1635 if (!image || !oldimage) {
1640 printk(KERN_ERR "%s: Unable to allocate memory "
1641 "for EEPROM image\n", dev->name);
1642 error = -ENOMEM; 1636 error = -ENOMEM;
1643 goto wf_out; 1637 goto wf_out;
1644 } 1638 }