projects
/
platform
/
kernel
/
linux-rpi.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
[platform/kernel/linux-rpi.git]
/
drivers
/
atm
/
zatm.c
diff --git
a/drivers/atm/zatm.c
b/drivers/atm/zatm.c
index
d3aa748
..
1ef67db
100644
(file)
--- a/
drivers/atm/zatm.c
+++ b/
drivers/atm/zatm.c
@@
-1613,7
+1613,7
@@
static int zatm_init_one(struct pci_dev *pci_dev,
ret = dma_set_mask_and_coherent(&pci_dev->dev, DMA_BIT_MASK(32));
if (ret < 0)
- goto out_
disabl
e;
+ goto out_
releas
e;
zatm_dev->pci_dev = pci_dev;
dev->dev_data = zatm_dev;