diff options
| author | Ingo Molnar <mingo@kernel.org> | 2016-12-11 13:05:59 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2016-12-11 13:05:59 +0100 |
| commit | 6de75a37b8e82e3e6bbc773c1fbc7df8338efb90 (patch) | |
| tree | c2dcd32fbc0e404367c77116412ca526a3b03ce0 /drivers/atm | |
| parent | 080c25914e6db40c5d7606d22fd592ae3d8c3e59 (diff) | |
| parent | 045169816b31b10faed984b01c390db1b32ee4c1 (diff) | |
Merge branch 'linus' into perf/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/atm')
| -rw-r--r-- | drivers/atm/eni.c | 2 | ||||
| -rw-r--r-- | drivers/atm/lanai.c | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/drivers/atm/eni.c b/drivers/atm/eni.c index f2aaf9e32a36..40c2d561417b 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 ce43ae3e87b3..445505d9ea07 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 */ |