summaryrefslogtreecommitdiffstats
path: root/drivers/atm
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2016-12-06 21:33:19 -0500
committerDavid S. Miller <davem@davemloft.net>2016-12-06 21:33:19 -0500
commitc63d352f053a788281eb90df0a71cd3a6b2c4040 (patch)
treece0c6f0993100d3d8feda1d9d487dfba4abc5bd0 /drivers/atm
parent862b3d2090ae3d8b10bb4ee9275fd932bc4d0d44 (diff)
parentbc3913a5378cd0ddefd1dfec6917cc12eb23a946 (diff)
downloadop-kernel-dev-c63d352f053a788281eb90df0a71cd3a6b2c4040.zip
op-kernel-dev-c63d352f053a788281eb90df0a71cd3a6b2c4040.tar.gz
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Diffstat (limited to 'drivers/atm')
-rw-r--r--drivers/atm/eni.c2
-rw-r--r--drivers/atm/lanai.c1
2 files changed, 2 insertions, 1 deletions
diff --git a/drivers/atm/eni.c b/drivers/atm/eni.c
index f2aaf9e..40c2d56 100644
--- a/drivers/atm/eni.c
+++ b/drivers/atm/eni.c
@@ -1727,7 +1727,7 @@ static int eni_do_init(struct atm_dev *dev)
printk("\n");
printk(KERN_ERR DEV_LABEL "(itf %d): can't set up page "
"mapping\n",dev->number);
- return error;
+ return -ENOMEM;
}
eni_dev->ioaddr = base;
eni_dev->base_diff = real_base - (unsigned long) base;
diff --git a/drivers/atm/lanai.c b/drivers/atm/lanai.c
index ce43ae3..445505d 100644
--- a/drivers/atm/lanai.c
+++ b/drivers/atm/lanai.c
@@ -2143,6 +2143,7 @@ static int lanai_dev_open(struct atm_dev *atmdev)
lanai->base = (bus_addr_t) ioremap(raw_base, LANAI_MAPPING_SIZE);
if (lanai->base == NULL) {
printk(KERN_ERR DEV_LABEL ": couldn't remap I/O space\n");
+ result = -ENOMEM;
goto error_pci;
}
/* 3.3: Reset lanai and PHY */
OpenPOWER on IntegriCloud