Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 3130
b: refs/heads/master
c: c9c12b7
h: refs/heads/master
v: v3
  • Loading branch information
Alexey Dobriyan authored and Linus Torvalds committed Jun 24, 2005
1 parent 98a6174 commit e5bfca3
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: a20758fa3238134ec9ac0a7e02446d9861dfe943
refs/heads/master: c9c12b790e1dad2e6c2a9b2e62e97297aa8dd93a
4 changes: 2 additions & 2 deletions trunk/drivers/media/video/saa7134/saa7134-core.c
Original file line number Diff line number Diff line change
Expand Up @@ -316,7 +316,7 @@ unsigned long saa7134_buffer_base(struct saa7134_buf *buf)

int saa7134_pgtable_alloc(struct pci_dev *pci, struct saa7134_pgtable *pt)
{
u32 *cpu;
__le32 *cpu;
dma_addr_t dma_addr;

cpu = pci_alloc_consistent(pci, SAA7134_PGTABLE_SIZE, &dma_addr);
Expand All @@ -332,7 +332,7 @@ int saa7134_pgtable_build(struct pci_dev *pci, struct saa7134_pgtable *pt,
struct scatterlist *list, unsigned int length,
unsigned int startpage)
{
u32 *ptr;
__le32 *ptr;
unsigned int i,p;

BUG_ON(NULL == pt || NULL == pt->cpu);
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/media/video/saa7134/saa7134.h
Original file line number Diff line number Diff line change
Expand Up @@ -241,7 +241,7 @@ struct saa7134_dma;
/* saa7134 page table */
struct saa7134_pgtable {
unsigned int size;
u32 *cpu;
__le32 *cpu;
dma_addr_t dma;
};

Expand Down

0 comments on commit e5bfca3

Please sign in to comment.