projects
/
cascardo
/
linux.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/wim/linux-2.6-watchdog
[cascardo/linux.git]
/
drivers
/
media
/
video
/
btcx-risc.c
diff --git
a/drivers/media/video/btcx-risc.c
b/drivers/media/video/btcx-risc.c
index
3324ab3
..
ac1b268
100644
(file)
--- a/
drivers/media/video/btcx-risc.c
+++ b/
drivers/media/video/btcx-risc.c
@@
-64,7
+64,7
@@
int btcx_riscmem_alloc(struct pci_dev *pci,
unsigned int size)
{
__le32 *cpu;
- dma_addr_t dma;
+ dma_addr_t dma
= 0
;
if (NULL != risc->cpu && risc->size < size)
btcx_riscmem_free(pci,risc);