projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'linux_next' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab...
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
atm
/
solos-pci.c
diff --git
a/drivers/atm/solos-pci.c
b/drivers/atm/solos-pci.c
index 943cf0d6abaf8b959e2a879ca901fedaea693b1e..7652e8dc188f93036e03a23a99ac7aee3b543811 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;
}