Merge branch 'stable-3.2' into pandora-3.2

[pandora-kernel.git] / drivers / media / video / saa7164 / saa7164-buffer.c

diff --git a/drivers/media/video/saa7164/saa7164-buffer.c b/drivers/media/video/saa7164/saa7164-buffer.c
index 66696fa..9bd1f73 100644 (file)
--- a/drivers/media/video/saa7164/saa7164-buffer.c
+++ b/drivers/media/video/saa7164/saa7164-buffer.c
@@ -130,9 +130,9 @@ struct saa7164_buffer *saa7164_buffer_alloc(struct saa7164_port *port,
                goto fail2;
 
        /* init the buffers to a known pattern, easier during debugging */
-       memset_io(buf->cpu, 0xff, buf->pci_size);
+       memset(buf->cpu, 0xff, buf->pci_size);
        buf->crc = crc32(0, buf->cpu, buf->actual_size);
-       memset_io(buf->pt_cpu, 0xff, buf->pt_size);
+       memset(buf->pt_cpu, 0xff, buf->pt_size);
 
        dprintk(DBGLVL_BUF, "%s()   allocated buffer @ 0x%p (%d pageptrs)\n",
                __func__, buf, params->numpagetables);