projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'topic/core-stuff-2014-08-15' of git://anongit.freedesktop.org/drm-intel...
[linux-2.6-microblaze.git]
/
drivers
/
atm
/
solos-pci.c
diff --git
a/drivers/atm/solos-pci.c
b/drivers/atm/solos-pci.c
index
943cf0d
..
7652e8d
100644
(file)
--- a/
drivers/atm/solos-pci.c
+++ b/
drivers/atm/solos-pci.c
@@
-1278,6
+1278,7
@@
static int fpga_probe(struct pci_dev *dev, const struct pci_device_id *id)
card->dma_bounce = kmalloc(card->nr_ports * BUF_SIZE, GFP_KERNEL);
if (!card->dma_bounce) {
dev_warn(&card->dev->dev, "Failed to allocate DMA bounce buffers\n");
+ err = -ENOMEM;
/* Fallback to MMIO doesn't work */
goto out_unmap_both;
}