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 branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux
[platform/kernel/linux-rpi.git]
/
arch
/
s390
/
pci
/
pci_dma.c
diff --git
a/arch/s390/pci/pci_dma.c
b/arch/s390/pci/pci_dma.c
index
5459020
..
1d7a9c7
100644
(file)
--- a/
arch/s390/pci/pci_dma.c
+++ b/
arch/s390/pci/pci_dma.c
@@
-425,7
+425,7
@@
static int __s390_dma_map_sg(struct device *dev, struct scatterlist *sg,
dma_addr_t dma_addr_base, dma_addr;
int flags = ZPCI_PTE_VALID;
struct scatterlist *s;
- unsigned long pa;
+ unsigned long pa
= 0
;
int ret;
dma_addr_base = dma_alloc_address(dev, nr_pages);