diff options
author | Steven Toth <stoth@kernellabs.com> | 2010-07-31 14:13:45 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2010-10-21 05:54:54 -0400 |
commit | 12d3203e39db306f56611b3f47ba425ca6a409f9 (patch) | |
tree | 3e7eba22186a7015be6529abd2c3ee3659b0b77c /drivers/media/video/saa7164/saa7164-buffer.c | |
parent | 46eeb8dd30d3651e6ea55c2e60594206cd591d79 (diff) |
[media] saa7164: buffer crc checks and ensure we use the memcpy func
Buffer crc checks and ensure we use the correct PCIe IO memcpy func
Signed-off-by: Steven Toth <stoth@kernellabs.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/saa7164/saa7164-buffer.c')
-rw-r--r-- | drivers/media/video/saa7164/saa7164-buffer.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/media/video/saa7164/saa7164-buffer.c b/drivers/media/video/saa7164/saa7164-buffer.c index 0760891d5fa8..b75157d411dd 100644 --- a/drivers/media/video/saa7164/saa7164-buffer.c +++ b/drivers/media/video/saa7164/saa7164-buffer.c | |||
@@ -113,6 +113,7 @@ struct saa7164_buffer *saa7164_buffer_alloc(struct saa7164_port *port, | |||
113 | buf->flags = SAA7164_BUFFER_FREE; | 113 | buf->flags = SAA7164_BUFFER_FREE; |
114 | buf->pos = 0; | 114 | buf->pos = 0; |
115 | buf->actual_size = params->pitch * params->numberoflines; | 115 | buf->actual_size = params->pitch * params->numberoflines; |
116 | buf->crc = 0; | ||
116 | /* TODO: arg len is being ignored */ | 117 | /* TODO: arg len is being ignored */ |
117 | buf->pci_size = SAA7164_PT_ENTRIES * 0x1000; | 118 | buf->pci_size = SAA7164_PT_ENTRIES * 0x1000; |
118 | buf->pt_size = (SAA7164_PT_ENTRIES * sizeof(u64)) + 0x1000; | 119 | buf->pt_size = (SAA7164_PT_ENTRIES * sizeof(u64)) + 0x1000; |
@@ -129,8 +130,9 @@ struct saa7164_buffer *saa7164_buffer_alloc(struct saa7164_port *port, | |||
129 | goto fail2; | 130 | goto fail2; |
130 | 131 | ||
131 | /* init the buffers to a known pattern, easier during debugging */ | 132 | /* init the buffers to a known pattern, easier during debugging */ |
132 | memset(buf->cpu, 0xff, buf->pci_size); | 133 | memset_io(buf->cpu, 0xff, buf->pci_size); |
133 | memset(buf->pt_cpu, 0xff, buf->pt_size); | 134 | buf->crc = crc32(0, buf->cpu, buf->actual_size); |
135 | memset_io(buf->pt_cpu, 0xff, buf->pt_size); | ||
134 | 136 | ||
135 | dprintk(DBGLVL_BUF, "%s() allocated buffer @ 0x%p\n", | 137 | dprintk(DBGLVL_BUF, "%s() allocated buffer @ 0x%p\n", |
136 | __func__, buf); | 138 | __func__, buf); |
@@ -296,6 +298,7 @@ struct saa7164_user_buffer *saa7164_buffer_alloc_user(struct saa7164_dev *dev, u | |||
296 | 298 | ||
297 | buf->actual_size = len; | 299 | buf->actual_size = len; |
298 | buf->pos = 0; | 300 | buf->pos = 0; |
301 | buf->crc = 0; | ||
299 | 302 | ||
300 | dprintk(DBGLVL_BUF, "%s() allocated user buffer @ 0x%p\n", | 303 | dprintk(DBGLVL_BUF, "%s() allocated user buffer @ 0x%p\n", |
301 | __func__, buf); | 304 | __func__, buf); |